From 33341205e7d76bf5477525ea1f62e8d31bb41ae1 Mon Sep 17 00:00:00 2001 From: ayumin Date: Wed, 11 Jan 2012 16:41:21 +0000 Subject: merge revision(s) 34250: * gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore an exception under rb_protect(). [ruby-dev:45113] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0c07b288a2..853ab07197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 12 01:41:13 2012 CHIKANAGA Tomoyuki + + * gc.c (run_finalizer): clear rb_thread_t::errinfo when ignore + an exception under rb_protect(). [ruby-dev:45113] + Thu Jan 12 01:40:33 2012 NAKAMURA Usaku * test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't diff --git a/version.h b/version.h index 51c491e145..fb21064150 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 22 +#define RUBY_PATCHLEVEL 23 #define RUBY_RELEASE_DATE "2012-01-12" #define RUBY_RELEASE_YEAR 2012 -- cgit v1.2.3