diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-16 18:19:10 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-16 18:19:10 +0000 |
commit | b9f5a6c2497b55387a3ee907d5869fdb462d6233 (patch) | |
tree | 4a514d9f346792c9275ddf3998526c102bbf007f /version.h | |
parent | bc69a7df4c6738d44b6fa75742458c6985750ddb (diff) |
merge revision(s) 50914,50915: [Backport #10852]
* test/objspace/test_objspace.rb (test_dump_flags): relax pattern
because long_lived flag and marked flag can be false at major GC.
[Bug #10852]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50923 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.2.3" -#define RUBY_RELEASE_DATE "2015-06-15" -#define RUBY_PATCHLEVEL 134 +#define RUBY_RELEASE_DATE "2015-06-17" +#define RUBY_PATCHLEVEL 135 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" |