From cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Tue, 11 Dec 2007 15:35:36 -0600
Subject: Renaming 'configuration' to 'catalog', fixing #954.

---
 lib/puppet/util/settings.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/puppet/util')

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 7b446e736..b672d9564 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -75,7 +75,7 @@ class Puppet::Util::Settings
     def apply
         trans = self.to_transportable
         begin
-            config = trans.to_configuration
+            config = trans.to_catalog
             config.store_state = false
             config.apply
             config.clear
@@ -590,7 +590,7 @@ class Puppet::Util::Settings
     # Convert our list of objects into a component that can be applied.
     def to_configuration
         transport = self.to_transportable
-        return transport.to_configuration
+        return transport.to_catalog
     end
 
     # Convert our list of config elements into a configuration file.
@@ -676,7 +676,7 @@ Generated on #{Time.now}.
 
             bucket = to_transportable(*sections)
 
-            config = bucket.to_configuration
+            config = bucket.to_catalog
             config.host_config = false
             config.apply do |transaction|
                 if failures = transaction.any_failed?
-- 
cgit