Backport #4357: Please backport r30629 and r30630 to 1_9_2

• Status: Closed
• Assignee: -

[tenderlovemaking (Aaron Patterson)]

=begin
A bug was reported with the way Psych handles merge keys in [ruby-core:34679]. These two commits fix merge key handling in Psych.
=end

[headius (Charles Nutter)]

=begin
+1. We have a bug report in JRuby for this, and will be incorporating these changes for our 1.6 release tomorrow. It would be nice if standard 1.9.2 would get the fixes as well.
=end

[headius (Charles Nutter)]

=begin
That should read "+1"
=end

[tunylund (Tuomas Nylund)]

=begin
"+1" for this. The bug keeps popping up every now and then.
=end

[AkitaOnRails (Fabio Akita)]

=begin
Totally +1 for that.
=end

[brendte (Brendten Eickstaedt)]

=begin
+1
=end

[nwjsmith (Nate Smith)]

+1

[maedhr (Craig Savolainen)]

+1

[sleekwong (Shawn Lee Kwong)]

+1

[gvetzal (Gillian Vetzal)]

Totally +1, pops up regularly lately.

[yugui (Yuki Sonoda)]

• Status changed from Open to Closed

=begin
merged at r31856.
=end