diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-16 16:27:56 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-16 16:27:56 +0000 |
commit | 664b94fd2b4b19edd7d75c6bbcd3154905b2624e (patch) | |
tree | 9d53b0ee7df087059a29d517a485652b7f8a1419 /version.h | |
parent | 02b8978ff10b05304dbb46d73b49a2cf3a87cb92 (diff) |
merge revision(s) 58471,58493,62436: [Backport #13505]
load.c: backtrace of circular require
* load.c (load_lock): print backtrace of circular require via
`Warning.warn` [ruby-core:80850] [Bug #13505]
Send the backtrace of the circular require warning as a single String to Warning.warn
* load.c: send as a single string.
* error.c: expose the string formatted by rb_warning as rb_warning_string().
* test/ruby/test_exception.rb: update tests.
[ruby-core:80850] [Bug #13505]
fix regexp literal warning.
* test/rubygems/test_gem_server.rb: eliminate duplicated character class warning.
[Bug #14481]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@62441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.9" -#define RUBY_RELEASE_DATE "2017-12-15" -#define RUBY_PATCHLEVEL 480 +#define RUBY_RELEASE_DATE "2018-02-17" +#define RUBY_PATCHLEVEL 481 -#define RUBY_RELEASE_YEAR 2017 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_YEAR 2018 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" |