diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-05 19:15:40 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-05 19:15:40 +0000 |
| commit | 9ae2651d1929891a443eb6a208fb1038c23b86e0 (patch) | |
| tree | e3de90b082f45e963a3a196708cdad260a8abf02 /ChangeLog | |
| parent | 7835e321ea05b3176f05f9840b7082b4378edc62 (diff) | |
| download | ruby-9ae2651d1929891a443eb6a208fb1038c23b86e0.tar.gz | |
* 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
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Wed Nov 6 04:14:25 2013 Aaron Patterson <aaron@tenderlovemaking.com> + + * 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 <akr@fsij.org> * test/ruby/test_thread.rb (test_thread_join_in_trap): |