From 095ebf1dfaddfd9a259f7ea9dc3c4e79961efd48 Mon Sep 17 00:00:00 2001 From: ayumin Date: Wed, 11 Jan 2012 16:41:54 +0000 Subject: [PATCH] merge revision(s) 34252: * lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even when exception is raised at @tempfile.close. [ruby-dev:45113] * lib/tempfile.rb (Tempfile#unlink): fix a typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ version.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 853ab07197..9139c7209c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jan 12 01:41:34 2012 CHIKANAGA Tomoyuki + + * lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even + when exception is raised at @tempfile.close. [ruby-dev:45113] + + * lib/tempfile.rb (Tempfile#unlink): fix a typo. + Thu Jan 12 01:41:13 2012 CHIKANAGA Tomoyuki * gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore diff --git a/version.h b/version.h index fb21064150..4f8e27aef2 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 23 +#define RUBY_PATCHLEVEL 24 #define RUBY_RELEASE_DATE "2012-01-12" #define RUBY_RELEASE_YEAR 2012