naruse	2015-01-16 21:18:38 +0900 (Fri, 16 Jan 2015)

  New Revision: 49283

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

  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_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/ruby/test_io.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49282)
+++ ruby_2_2/ChangeLog	(revision 49283)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Jan 16 21:17:34 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* test/ruby/test_io.rb: added timeout for AIX environment.
+	  [ruby-core:62983][Bug #9917]
+
 Fri Jan 16 18:25:57 2015  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49282)
+++ ruby_2_2/version.h	(revision 49283)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-16"
-#define RUBY_PATCHLEVEL 14
+#define RUBY_PATCHLEVEL 15
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_2/test/ruby/test_io.rb
===================================================================
--- ruby_2_2/test/ruby/test_io.rb	(revision 49282)
+++ ruby_2_2/test/ruby/test_io.rb	(revision 49283)
@@ -3051,7 +3051,7 @@ End https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_io.rb#L3051
       }
 
       IO.select(tempfiles)
-  }, bug8080
+    }, bug8080, timeout: 30
   end
 
   def test_read_32bit_boundary

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


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