diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-02 00:14:53 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-02 00:14:53 +0000 |
| commit | 4041a4ff759a5a757f032053cba40a4d1e69ee0e (patch) | |
| tree | 917c0364509a396c37db40aa22026b9c9fac4aa2 /version.h | |
| parent | 4b1fbbe92a758416294c3f336bb8e22bab3f1ff0 (diff) | |
merge revision(s) 63054,63055,63056: [Backport #14655]
test_time_tz.rb: Kiritimati tzdata fix
* test/ruby/test_time_tz.rb (TestTimeTZ#test_pacific_kiritimati):
fix the expected data at the skip of New Year's Eve 1994.
[Bug #14655]
test_time_tz.rb: Kiritimati tzdata fix
* test/ruby/test_time_tz.rb (gen_zdump_test): fix the expected
data at the Kiritimati's skip of New Year's Eve 1994.
[Bug #14655]
test_time_tz.rb: Lisbon tzdata fix
* test/ruby/test_time_tz.rb (gen_variational_zdump_test): Update
Lisbon zdump data, which fixed the 1912-01-01 transition for
Portugual and its colonies. [Bug #14655]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@63817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "2.5.1" -#define RUBY_RELEASE_DATE "2018-03-31" -#define RUBY_PATCHLEVEL 59 +#define RUBY_RELEASE_DATE "2018-07-02" +#define RUBY_PATCHLEVEL 60 #define RUBY_RELEASE_YEAR 2018 -#define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 7 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" |