diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-11 15:35:36 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-11 15:35:36 -0600 |
| commit | cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5 (patch) | |
| tree | b4284addea69adf9d19028ff1bab94035b1c1827 /lib/puppet/util | |
| parent | 7ac3bd79621f6c66cd3b5b7041aeba83c27c3602 (diff) | |
| download | puppet-cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5.tar.gz puppet-cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5.tar.xz puppet-cb0c4eebb0a7b2fadc5e0487e1c692007cb8b2e5.zip | |
Renaming 'configuration' to 'catalog', fixing #954.
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/settings.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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? |