diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-08-29 14:03:18 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-08-29 14:03:18 -0700 |
| commit | 08092b0f089f914388bfdf4775fb260a80ef7361 (patch) | |
| tree | 2e5d64942027fb8aa860592a9e3456c176231e65 /CHANGELOG.rdoc | |
| parent | de391773646546deb81f9ed0dabaa9c828356f98 (diff) | |
| download | psych-08092b0f089f914388bfdf4775fb260a80ef7361.tar.gz | |
* ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings
should not be treated as merge keys.
* ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys
containing "<<" should roundtrip.
* test/psych/test_merge_keys.rb: test for change. Fixes GH #203
fixes #203
Diffstat (limited to 'CHANGELOG.rdoc')
| -rw-r--r-- | CHANGELOG.rdoc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index cd87b92..fa8bb2e 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,3 +1,11 @@ +Sat Aug 30 06:00:26 2014 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings + should not be treated as merge keys. + * ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys + containing "<<" should roundtrip. + * test/psych/test_merge_keys.rb: test for change. Fixes GH #203 + Wed Aug 6 03:41:21 2014 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility for |