From f22910b68ab3bb9bcf7a0795501238045204f3ee Mon Sep 17 00:00:00 2001 From: ayumin Date: Wed, 11 Jan 2012 16:42:25 +0000 Subject: [PATCH] merge revision(s) 34253: * test/ruby/test_io.rb (test_autoclose_true_closed_by_finalizer, test_autoclose_true_closed_by_finalizer): skip if IO objects are not recycled yet. [ruby-dev:45098] [Bug #5850] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9139c7209c..e71a1d37b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 12 01:42:08 2012 CHIKANAGA Tomoyuki + + * test/ruby/test_io.rb (test_autoclose_true_closed_by_finalizer, + test_autoclose_true_closed_by_finalizer): skip if IO objects are + not recycled yet. [ruby-dev:45098] [Bug #5850] + Thu Jan 12 01:41:34 2012 CHIKANAGA Tomoyuki * lib/tempfile.rb (Tempfile#_close): clear @tempfile and @data[1] even diff --git a/version.h b/version.h index 4f8e27aef2..4e5f1b9d78 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 24 +#define RUBY_PATCHLEVEL 25 #define RUBY_RELEASE_DATE "2012-01-12" #define RUBY_RELEASE_YEAR 2012