summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-31 15:43:50 (GMT)
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-31 15:43:50 (GMT)
commit410b031acb0b85e86564cc5d6fdde57b1251505f (patch)
tree0192959c65cc6812710bb3d1ecefed75156e0977
parent3692b61180aa76a7e637e9f0e5f75f501e30bec4 (diff)
parent674725f1e83627b04da8a0a83da83a4454e3796e (diff)
add tag v2_1_10v2_1_10
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v2_1_10@54464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/rubygems/test_gem_commands_environment_command.rb2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 31b9f36..9c0dee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 1 00:41:17 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/rubygems/test_gem_commands_environment_command.rb (test_execute):
+ version number may be two-digit.
+
Fri Apr 1 00:00:31 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* version.h: bump to 2.1.10. welcome to two-digit version!
diff --git a/test/rubygems/test_gem_commands_environment_command.rb b/test/rubygems/test_gem_commands_environment_command.rb
index bb7589f..039ed00 100644
--- a/test/rubygems/test_gem_commands_environment_command.rb
+++ b/test/rubygems/test_gem_commands_environment_command.rb
@@ -22,7 +22,7 @@ class TestGemCommandsEnvironmentCommand < Gem::TestCase
end
assert_match %r|RUBYGEMS VERSION: (\d\.)+\d|, @ui.output
- assert_match %r|RUBY VERSION: \d\.\d\.\d \(.*\) \[.*\]|, @ui.output
+ assert_match %r|RUBY VERSION: \d+\.\d+\.\d+ \(.*\) \[.*\]|, @ui.output
assert_match %r|INSTALLATION DIRECTORY: #{Regexp.escape @gemhome}|,
@ui.output
assert_match %r|RUBYGEMS PREFIX: |, @ui.output
diff --git a/version.h b/version.h
index d576e07..60376cd 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.10"
#define RUBY_RELEASE_DATE "2016-04-01"
-#define RUBY_PATCHLEVEL 491
+#define RUBY_PATCHLEVEL 492
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 4