merge revision(s) 41468:

	test_fiber.rb: longer timeout

	* test/ruby/test_fiber.rb (test_many_fibers): make timeout longer.
  10sec is not sufficient.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 5 deletions

diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index 38050386c4..411151ab76 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -46,7 +46,7 @@ class TestFiber < Test::Unit::TestCase
   end
 
   def test_many_fibers_with_threads
-    assert_normal_exit %q{
+    assert_normal_exit <<-SRC, timeout: 60
       max = 1000
       @cnt = 0
       (1..100).map{|ti|
@@ -60,7 +60,7 @@ class TestFiber < Test::Unit::TestCase
       }.each{|t|
         t.join
       }
-    }
+    SRC
   end
 
   def test_error
diff --git a/version.h b/version.h
index 5255184628..3d85773a26 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-06-19"
-#define RUBY_PATCHLEVEL 234
+#define RUBY_RELEASE_DATE "2013-06-20"
+#define RUBY_PATCHLEVEL 235
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
 
 #include "ruby/version.h"