From f82fd950c1a86235eb0529641f482b5a7e4ba835 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 21 Nov 2016 07:56:47 +0000 Subject: merge revision(s) 53668: [Backport #12759] * lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter `basename` is optional and defaulted to an empty string since [GH-523]. [Fix GH-1225] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/tempfile.rb | 2 +- version.h | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4690f79c0e..2982c96e13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 21 16:55:15 2016 boshan + + * lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter + `basename` is optional and defaulted to an empty string since + [GH-523]. [Fix GH-1225] + Sat Nov 19 14:06:07 2016 CHIKANAGA Tomoyuki * iseq.c (proc_dup): don't duplicate sym_procs. [Fix GH-1479] diff --git a/lib/tempfile.rb b/lib/tempfile.rb index 13d9585a3b..223637f84a 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -80,7 +80,7 @@ require 'tmpdir' # mutex. class Tempfile < DelegateClass(File) # call-seq: - # new(basename, [tmpdir = Dir.tmpdir], [options]) + # new(basename = "", [tmpdir = Dir.tmpdir], [options]) # # Creates a temporary file with permissions 0600 (= only readable and # writable by the owner) and opens it with mode "w+". diff --git a/version.h b/version.h index cbf5191573..14d5dd5163 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.3" -#define RUBY_RELEASE_DATE "2016-11-19" -#define RUBY_PATCHLEVEL 221 +#define RUBY_RELEASE_DATE "2016-11-21" +#define RUBY_PATCHLEVEL 222 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 21 #include "ruby/version.h" -- cgit v1.2.3