summaryrefslogtreecommitdiff
path: root/CHANGELOG.rdoc
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-08-29 14:12:20 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-08-29 14:12:20 -0700
commit854c567fc73419f0c48f8e4dc5da061fe7bc10b5 (patch)
tree504b89821e4e003431dfef9af766e5607b15a9be /CHANGELOG.rdoc
parent08092b0f089f914388bfdf4775fb260a80ef7361 (diff)
downloadpsych-854c567fc73419f0c48f8e4dc5da061fe7bc10b5.tar.gz
* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash
should merge the hash in to the parent. * test/psych/test_merge_keys.rb: test for change. Fixes GH #202 Fixes #202
Diffstat (limited to 'CHANGELOG.rdoc')
-rw-r--r--CHANGELOG.rdoc6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index fa8bb2e..96b528b 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,9 @@
+Sat Aug 30 06:10:39 2014 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash
+ should merge the hash in to the parent.
+ * test/psych/test_merge_keys.rb: test for change. Fixes GH #202
+
Sat Aug 30 06:00:26 2014 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings