zzak	2013-04-28 10:11:55 +0900 (Sun, 28 Apr 2013)

  New Revision: 40509

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40509

  Log:
    * lib/yaml.rb: Disable setting YAML const twice [ruby-core:54642]

  Modified files:
    trunk/ChangeLog
    trunk/lib/yaml.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40508)
+++ ChangeLog	(revision 40509)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Apr 28 10:10:00 2013  Zachary Scott  <zachary@z...>
+
+	* lib/yaml.rb: Disable setting YAML const twice [ruby-core:54642]
+
 Sun Apr 28 09:50:00 2013  Zachary Scott  <zachary@z...>
 
 	* object.c: Documentation for taint and trust [Bug #8162]
Index: lib/yaml.rb
===================================================================
--- lib/yaml.rb	(revision 40508)
+++ lib/yaml.rb	(revision 40509)
@@ -79,5 +79,5 @@ end https://github.com/ruby/ruby/blob/trunk/lib/yaml.rb#L79
 #
 # For more advanced details on the implementation see Psych, and also check out
 # yaml.org for spec details and other helpful information.
-module YAML; end
+module YAML end if false
 YAML = Psych

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/