usa	2015-01-22 18:10:55 +0900 (Thu, 22 Jan 2015)

  New Revision: 49381

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

  Log:
    merge revision(s) 49148: [Backport #9917]
    
    * test/ruby/test_io.rb: added timeout for AIX environment.
      [ruby-core:62983][Bug #9917]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/ruby/test_io.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 49380)
+++ ruby_2_0_0/ChangeLog	(revision 49381)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Jan 22 18:10:35 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* test/ruby/test_io.rb: added timeout for AIX environment.
+	  [ruby-core:62983][Bug #9917]
+
 Thu Jan 22 17:30:33 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* lib/net/http.rb (Net::HTTP#send_request): there is no response body
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 49380)
+++ ruby_2_0_0/version.h	(revision 49381)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2015-01-22"
-#define RUBY_PATCHLEVEL 615
+#define RUBY_PATCHLEVEL 616
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_0_0/test/ruby/test_io.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_io.rb	(revision 49380)
+++ ruby_2_0_0/test/ruby/test_io.rb	(revision 49381)
@@ -2742,7 +2742,7 @@ End https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_io.rb#L2742
       }
 
       IO.select(tempfiles)
-  }, bug8080
+    }, bug8080, timeout: 30
   end
 
   def test_read_32bit_boundary

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49148


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