merge revision(s) r46397: [Backport #10434]

	envutil.rb: avoid error on OS X 10.10

	* test/ruby/envutil.rb (diagnostic_reports): Mac OS X 10.10 may
  not create plist file with crash file together.

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

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index fa130898d6..a6a9f70820 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -192,7 +192,7 @@ module EnvUtil
           log = File.read(name) rescue next
           if /\AProcess:\s+#{cmd} \[#{pid}\]$/ =~ log
             File.unlink(name)
-            File.unlink("#{path}/.#{File.basename(name)}.plist")
+            File.unlink("#{path}/.#{File.basename(name)}.plist") rescue nil
             return log
           end
         end
diff --git a/version.h b/version.h
index 8637c33316..df0266845d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2014-11-05"
-#define RUBY_PATCHLEVEL 268
+#define RUBY_PATCHLEVEL 269
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 11