summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-16 09:18:51 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-16 09:18:51 +0000
commit8119cbae1fec6c3dc90c8a6a85f69409b77bb6b2 (patch)
tree5b1f44405cf5403c911e612b49293c39fc2f6bd8 /ChangeLog
parenta86d454538259e3269cbfc29ed01d1760676e5d0 (diff)
fix typos [ci skip]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e203d1635c..205b0588e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,9 +22,9 @@ Thu May 15 21:04:06 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* lib/test/unit/parallel.rb: fix test-all parallel failure if a test
is skipped after raise.
DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
- But it causes Mashal.load failure due to undefined class/module
+ But it causes Marshal.load failure due to undefined class/module
DL::DLError when doing test-all parallel and test-all doesn't
- complete. We create new MiniTest::Skip object to avoid Mashal.load
+ complete. We create new MiniTest::Skip object to avoid Marshal.load
failure.
[ruby-core:62133] [Bug #9767]