diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-11-05 11:16:43 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-11-05 11:16:43 -0800 |
| commit | 1003a03192c3a6c18cd43502ad496019d4682bc0 (patch) | |
| tree | f2d89696c83a95f3831d74f20dbbb61d524bdb38 /CHANGELOG.rdoc | |
| parent | 41152b94465765e77bf5c479e3d542339b61459f (diff) | |
| download | psych-1003a03192c3a6c18cd43502ad496019d4682bc0.zip | |
* 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
Fixes #169
Diffstat (limited to 'CHANGELOG.rdoc')
| -rw-r--r-- | CHANGELOG.rdoc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 4dc406e..a0b07d3 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -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 + Wed Oct 30 03:25:10 2013 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/yaml_tree.rb: make less garbage when |