From 9ae2651d1929891a443eb6a208fb1038c23b86e0 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Tue, 5 Nov 2013 19:15:40 +0000 Subject: * ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys before reviving objects. Fixes GH psych #168 * test/psych/test_merge_keys.rb: test for change https://github.com/tenderlove/psych/issues/168 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index faf3fe9c02..beb65845ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Nov 6 04:14:25 2013 Aaron Patterson + + * ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys before + reviving objects. Fixes GH psych #168 + * test/psych/test_merge_keys.rb: test for change + https://github.com/tenderlove/psych/issues/168 + Tue Nov 5 21:21:47 2013 Tanaka Akira * test/ruby/test_thread.rb (test_thread_join_in_trap): -- cgit v1.2.3