summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-08-06 09:40:47 -0700
committerMarkus Roberts <Markus@reality.com>2010-08-06 09:40:47 -0700
commitf43e87bb638b30608e1773a9afb48a8639feb3cd (patch)
tree167cbd6e52903266890e956a573f8b012a84862e /lib/puppet
parenta23d80aebabf981a34fcca5c8bd2aa5f44ea832d (diff)
downloadpuppet-f43e87bb638b30608e1773a9afb48a8639feb3cd.tar.gz
puppet-f43e87bb638b30608e1773a9afb48a8639feb3cd.tar.xz
puppet-f43e87bb638b30608e1773a9afb48a8639feb3cd.zip
Fix for #4476 -- rails calling yaml internals
Some recent versions of rails have started calling yaml with the internal (and IIRC depricated) signature; this does nothing special in yaml but it breaks with zaml, so we add an ignored parameter to simulate the non-behavior. *sigh* I love rails.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/monkey_patches.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb
index 9664ff310..6b5af8350 100644
--- a/lib/puppet/util/monkey_patches.rb
+++ b/lib/puppet/util/monkey_patches.rb
@@ -25,7 +25,7 @@ end
[Object, Exception, Integer, Struct, Date, Time, Range, Regexp, Hash, Array, Float, String, FalseClass, TrueClass, Symbol, NilClass, Class].each { |cls|
cls.class_eval do
- def to_yaml
+ def to_yaml(ignored=nil)
ZAML.dump(self)
end
end