Merge branch '0.24.x'

Conflicts:

	lib/puppet/util/settings.rb
	spec/integration/defaults.rb
	spec/unit/node/catalog.rb
	spec/unit/type/interface.rb
	spec/unit/type/ssh_authorized_key.rb

2 files changed, 5 insertions, 2 deletions

diff --git a/bin/filebucket b/bin/filebucket
index 5790c9460..17e01ed64 100755
--- a/bin/filebucket
+++ b/bin/filebucket
@@ -163,8 +163,9 @@ end
 # Now parse the config
 Puppet.parse_config
 
-Puppet.genconfig
-Puppet.genmanifest
+if Puppet.settings.print_configs?
+        exit(Puppet.settings.print_configs ? 0 : 1)
+end
 
 begin
     if options[:local] or options[:bucket]
diff --git a/bin/puppet b/bin/puppet
index 5e10ad460..530766800 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -212,6 +212,8 @@ begin
     # Translate it to a RAL catalog
     catalog = catalog.to_ral
 
+    catalog.host_config = true if Puppet[:graph] or Puppet[:report]
+
     catalog.finalize
 
     # And apply it