Merge branch 'configurations' into indirection

Conflicts:

	lib/puppet/defaults.rb
	lib/puppet/indirector/facts/yaml.rb
	spec/unit/indirector/indirection.rb
	spec/unit/indirector/indirector.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/bin/puppet b/bin/puppet
index 36f0fcd62..9520492a2 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -194,8 +194,8 @@ begin
     if Puppet[:parseonly]
         exit(0)
     end
-    client.getconfig
-    client.apply
+    config = client.getconfig
+    config.apply
 rescue => detail
     if detail.is_a?(XMLRPC::FaultException)
         $stderr.puts detail.message