diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-10 06:54:56 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-10 06:54:56 +0000 |
commit | 7a25e90ee5174d975c44ed232258ff5c41a54a18 (patch) | |
tree | 9b95b15923af984a61c93ca05eac6ad1ab4c095d /ChangeLog | |
parent | 1511ef08ef72e17f648599cf6fddc2ea6d17d27e (diff) |
merge revision(s) 54970: [Backport #12367]
* insns.def (defineclass): Also raise an error when redeclaring the
superclass of a class as Object and it has another superclass.
[Bug #12367] [ruby-core:75446]
* test/ruby/test_class.rb: test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Fri Jun 10 15:54:05 2016 Benoit Daloze <eregontp@gmail.com> + + * insns.def (defineclass): Also raise an error when redeclaring the + superclass of a class as Object and it has another superclass. + [Bug #12367] [ruby-core:75446] + + * test/ruby/test_class.rb: test for above. + Fri Jun 10 15:46:24 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * bignum.c: [DOC] Update result of 123456789 ** -2. |