summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-30 07:34:23 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-30 07:34:23 +0000
commitfdec8bb0b30a6c28c7ef4569880b2faf4519c9af (patch)
tree88849175f562adb9d076935c51715a173af0eb0f /ChangeLog
parent29fdecfe829258d8cadfaad7e0484a746b1dfdf2 (diff)
merge revision(s) 45364,45395,45396,45403,45406: [Backport #9652]
* time.c (time_mload): freeze and preserve marshal-loaded time zone * test/ruby/test_time.rb: add test for GC on loaded object [Bug #9652] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d93c5c2a63..35f10dee5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 30 16:33:57 2014 Eric Wong <e@80x24.org>
+
+ * time.c (time_mload): freeze and preserve marshal-loaded time zone
+ * test/ruby/test_time.rb: add test for GC on loaded object
+ [Bug #9652]
+
Wed Apr 30 16:15:09 2014 Kohei Suzuki <eagletmt@gmail.com>
* vm_method.c (rb_method_entry_get_without_cache): me->klass is 0