diff options
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 98e3524..ec12e87 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,3 +1,10 @@ +Sat Jan 12 08:58:47 2013 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/visitors/to_ruby.rb: merge key values that + contain something besides a hash should be left in tact. + + * test/psych/test_merge_keys.rb: test for change + Thu Jan 10 04:23:07 2013 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/scalar_scanner.rb: strip trailing dots from |