diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-23 07:02:29 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-23 07:02:29 +0000 |
commit | c358595ae42e1b5ed4647dd017d91cf3aa480740 (patch) | |
tree | 7aeecfce98169ba92ca319140d4d794c0a052e7c /version.h | |
parent | f03997d328c2a536ad4b6c5a262ad1345570288f (diff) |
merge revision(s) 59080,59082: [Backport #13656]
proc.c: skip prepended modules
* proc.c (method_super_method): skip prepended modules and
continue from the super class of the original class.
[ruby-core:81666] [Bug #13656]
test/ruby/test_method.rb: refined [ruby-core:81666] [Bug #13656]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.4.2" -#define RUBY_RELEASE_DATE "2017-07-18" -#define RUBY_PATCHLEVEL 146 +#define RUBY_RELEASE_DATE "2017-07-23" +#define RUBY_PATCHLEVEL 147 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" |