diff options
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/defaults.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/resource.rb | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 8743f859d..a2ccd8a05 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -490,7 +490,7 @@ module Puppet authority requests. It's a separate server because it cannot and does not need to horizontally scale."], :ca_port => ["$masterport", "The port to use for the certificate authority."], - :preferred_serialization_format => ["yaml", "The preferred means of serializing + :preferred_serialization_format => ["json", "The preferred means of serializing ruby instances for passing over the wire. This won't guarantee that all instances will be serialized using this method, since not all classes can be guaranteed to support this format, but it will be used for all diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb index 862aadf99..0de089cd7 100644 --- a/lib/puppet/resource.rb +++ b/lib/puppet/resource.rb @@ -68,14 +68,6 @@ class Puppet::Resource 'json_class' => self.class.name, 'data' => data } - #data.each do |key, value| - # puts "Converting %s (%s)" % [key, value.inspect] - # p value - # value.to_json(*args) - # key.to_json(*args) - #end - #puts "Converted all" - #p res res.to_json(*args) end |