nagachika	2015-01-06 00:01:18 +0900 (Tue, 06 Jan 2015)

  New Revision: 49150

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49150

  Log:
    * test/ruby/test_string.rb(test_LSHIFT_neary_long_max):
      increase timeout for Arch Linux CI environment.

  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/ruby/test_string.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49149)
+++ ruby_2_1/ChangeLog	(revision 49150)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Jan  5 23:58:50 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* test/ruby/test_string.rb(test_LSHIFT_neary_long_max):
+	  increase timeout for Arch Linux CI environment.
+
 Wed Dec 31 00:00:09 2014  NARUSE, Yui  <naruse@r...>
 
 	* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49149)
+++ ruby_2_1/version.h	(revision 49150)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2014-12-31"
-#define RUBY_PATCHLEVEL 275
+#define RUBY_RELEASE_DATE "2015-01-05"
+#define RUBY_PATCHLEVEL 276
 
-#define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_YEAR 2015
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 5
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/ruby/test_string.rb
===================================================================
--- ruby_2_1/test/ruby/test_string.rb	(revision 49149)
+++ ruby_2_1/test/ruby/test_string.rb	(revision 49150)
@@ -2227,7 +2227,7 @@ class TestString < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_string.rb#L2227
 
   def test_LSHIFT_neary_long_max
     return unless @cls == String
-    assert_ruby_status([], <<-'end;', '[ruby-core:61886] [Bug #9709]', timeout: 20)
+    assert_ruby_status([], <<-'end;', '[ruby-core:61886] [Bug #9709]', timeout: 60)
       begin
         a = "a" * 0x4000_0000
         a << "a" * 0x1_0000

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/