naruse	2014-12-24 02:41:07 +0900 (Wed, 24 Dec 2014)

  New Revision: 48947

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

  Log:
    merge revision(s) 48905: [Backport #10616]
    
    * lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1.
      [ruby-core:66943] [Bug #10616] Fixed by Alex Slynko.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/tmpdir.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 48946)
+++ ruby_2_2/ChangeLog	(revision 48947)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Dec 24 02:22:11 2014  Tanaka Akira  <akr@f...>
+
+	* lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1.
+	  [ruby-core:66943] [Bug #10616] Fixed by Alex Slynko.
+
 Sat Dec 20 04:58:00 2014  Kenta Murata  <mrkn@c...>
 
 	* ext/bigdecimal/depend: Fix dependencies to make bigdecimal
Index: ruby_2_2/lib/tmpdir.rb
===================================================================
--- ruby_2_2/lib/tmpdir.rb	(revision 48946)
+++ ruby_2_2/lib/tmpdir.rb	(revision 48947)
@@ -81,8 +81,8 @@ class Dir https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/tmpdir.rb#L81
   #    FileUtils.remove_entry dir
   #  end
   #
-  def Dir.mktmpdir(prefix_suffix="d", *rest)
-    path = Tmpname.create(prefix_suffix, *rest) {|n| mkdir(n, 0700)}
+  def Dir.mktmpdir(prefix_suffix=nil, *rest)
+    path = Tmpname.create(prefix_suffix || "d", *rest) {|n| mkdir(n, 0700)}
     if block_given?
       begin
         yield path
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 48946)
+++ ruby_2_2/version.h	(revision 48947)
@@ -1,11 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2014-12-20"
+#define RUBY_RELEASE_DATE "2014-12-24"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 

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


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