merge revision(s) 49148: [Backport #9917]

	* test/ruby/test_io.rb: added timeout for AIX environment.
	  [ruby-core:62983][Bug #9917]


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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c994df6513..ab7476f055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 16 21:17:34 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* 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@fsij.org>
 
 	* lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 02381b132c..935ee24d83 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3051,7 +3051,7 @@ End
       }
 
       IO.select(tempfiles)
-  }, bug8080
+    }, bug8080, timeout: 30
   end
 
   def test_read_32bit_boundary
diff --git a/version.h b/version.h
index 74a741635c..f07380d2db 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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