summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-04-19 11:04:32 -0700
committerJames Turnbull <james@lovedthanlost.net>2010-04-20 15:14:24 +1000
commitf6046abcb44b99d1385462f4576f180184e3154e (patch)
treecfb933da07168662e2a2bbeb8d053b91dd726675
parentf351e2dcf0c133c7e800f09f9a6f65146d856bde (diff)
downloadpuppet-f6046abcb44b99d1385462f4576f180184e3154e.tar.gz
puppet-f6046abcb44b99d1385462f4576f180184e3154e.tar.xz
puppet-f6046abcb44b99d1385462f4576f180184e3154e.zip
Fix for #3577 -- to_yaml parameter in 0.25.5rc1
The new to_yaml method doesn't take format arguments (as they are unnneeded). Signed-off-by: Markus Roberts <Markus@reality.com>
-rw-r--r--lib/puppet/network/handler/master.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index e21e1e6e3..3b5182226 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -66,7 +66,7 @@ class Puppet::Network::Handler
case format
when "yaml"
- return CGI.escape(catalog.extract.to_yaml(:UseBlock => true))
+ return CGI.escape(catalog.extract.to_yaml)
when "marshal"
return CGI.escape(Marshal.dump(catalog.extract))
else