merge revision(s) 50985: [Backport #11693]

	runruby.rb: don't close other fds

	* tool/runruby.rb: rubyspec now requires other FDs not to be
  closed since 7b6ce1fee.

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

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a8d69096e1..2dbc7ad078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 16 03:39:59 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* tool/runruby.rb: rubyspec now requires other FDs not to be closed
+	  since 7b6ce1fee.
+
 Sun Nov  8 23:30:56 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_trace.c (rb_threadptr_exec_event_hooks_orig):
diff --git a/tool/runruby.rb b/tool/runruby.rb
index 86b9327350..80ad66a497 100755
--- a/tool/runruby.rb
+++ b/tool/runruby.rb
@@ -89,6 +89,7 @@ ENV.update env
 cmd = [ruby]
 cmd.concat(ARGV)
 cmd.unshift(*precommand) unless precommand.empty?
+cmd.push(:close_others => false)
 
 if show
   require 'shellwords'
diff --git a/version.h b/version.h
index abb7233515..884d4bdea1 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-11-08"
-#define RUBY_PATCHLEVEL 186
+#define RUBY_RELEASE_DATE "2015-11-16"
+#define RUBY_PATCHLEVEL 187
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 16
 
 #include "ruby/version.h"