diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 03:46:21 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 03:46:21 +0000 |
| commit | dd0f22f9cbf592d3ae17b03708ab66b4be7e6640 (patch) | |
| tree | 1ec4cb95489c40d8dd4794a3598cc221ea6a6ed3 /ChangeLog | |
| parent | e9faf5ffabbb5addd1ac298fe8cdcb0e068ea59d (diff) | |
merges r30629 and r30630 from trunk into ruby_1_9_2.
--
* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
part of YAML 1.1, so they should be supported. Remove warning and
merge keys to parent. [ruby-core:34679]
* test/psych/test_merge_keys.rb: test for merge keys
--
* ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
when multiple merge keys are specified.
* test/psych/test_merge_keys.rb: tests for multi-merge key support
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,18 @@ +Sat Jan 22 11:49:55 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support + when multiple merge keys are specified. + + * test/psych/test_merge_keys.rb: tests for multi-merge key support + +Sat Jan 22 11:33:04 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually + part of YAML 1.1, so they should be supported. Remove warning and + merge keys to parent. [ruby-core:34679] + + * test/psych/test_merge_keys.rb: test for merge keys + Thu Jul 15 00:35:09 2010 Tanaka Akira <akr@fsij.org> * time.c (localtime_with_gmtoff_zone): renamed from |