ruby-changes:73510
From: nagachika <ko1@a...>
Date: Sat, 10 Sep 2022 16:55:06 +0900 (JST)
Subject: [ruby-changes:73510] 9581248c4a (ruby_3_1): merge revision(s) b7577b4d9e0fd92522fc30e10fe712e245adee8c:
https://git.ruby-lang.org/ruby.git/commit/?id=9581248c4a From 9581248c4a48432c8c48d6bbf03a044c8f8e1cdc Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sat, 10 Sep 2022 16:54:43 +0900 Subject: merge revision(s) b7577b4d9e0fd92522fc30e10fe712e245adee8c: The tzdata 2022c removed Amsterdam Mean Time --- spec/ruby/core/time/shared/local.rb | 2 ++ 1 file changed, 2 insertions(+) --- spec/ruby/core/time/shared/local.rb | 2 ++ version.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/ruby/core/time/shared/local.rb b/spec/ruby/core/time/shared/local.rb index 43f331c4c1..997b7186f1 100644 --- a/spec/ruby/core/time/shared/local.rb +++ b/spec/ruby/core/time/shared/local.rb @@ -6,6 +6,7 @@ describe :time_local, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/time/shared/local.rb#L6 end end +=begin platform_is_not :windows do describe "timezone changes" do it "correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam'" do @@ -16,6 +17,7 @@ describe :time_local, shared: true do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/time/shared/local.rb#L17 end end end +=end end describe :time_local_10_arg, shared: true do diff --git a/version.h b/version.h index bb0f7ed4bb..05a3b226de 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 50 +#define RUBY_PATCHLEVEL 51 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 9 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/