summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-05 09:28:08 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-05 09:28:08 +0000
commitfb9df41221bfe285227537e04cb822b28188501e (patch)
treef55a0f8a40ed1a17ea6957e59754213d6fc291e1 /ChangeLog
parentac96c3f6c2e500ff6cc8cbceb98363eddb50f890 (diff)
merge revision(s) 48102: [Backport #10413]
* class.c (unknown_keyword_error): delete expected keywords directly from raw table, so that the given block is not called. [ruby-core:65837] [Bug #10413] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b0a39875df..935912e530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 5 18:26:49 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * vm_insnhelper.c (unknown_keyword_error): delete expected keywords
+ directly from raw table, so that the given block is not called.
+ derived from r48102 of trunk.
+ [ruby-core:65837] [Bug #10413]
+
Mon Oct 27 20:21:05 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/rexml/entity.rb: keep the entity size within the limitation.