diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-02-07 23:56:59 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-02-07 23:56:59 +0000 |
| commit | 6d8068eddd0d29ec53f62557eb53f6ebb8e40591 (patch) | |
| tree | 8c93181b9325fee95d7ecdc6e79341ff6d3604b0 /lib/puppet/client | |
| parent | 162602323406117444ce4375ead91d8f92f2b31a (diff) | |
Moving some of the stand-alone classes into the util/ subdirectory, to clean up the top-level namespace a bit. This is a lot of file modifications, but most of them just change class names and file paths.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2178 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/client')
| -rw-r--r-- | lib/puppet/client/master.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb index b59d710c9..046e0c5aa 100644 --- a/lib/puppet/client/master.rb +++ b/lib/puppet/client/master.rb @@ -137,7 +137,7 @@ class Puppet::Client::MasterClient < Puppet::Client puts detail.backtrace end ensure - Puppet::Storage.store + Puppet::Util::Storage.store end if Puppet[:report] @@ -177,8 +177,8 @@ class Puppet::Client::MasterClient < Puppet::Client # Initialize and load storage def dostorage begin - Puppet::Storage.load - @compile_time ||= Puppet::Storage.cache(:configuration)[:compile_time] + Puppet::Util::Storage.load + @compile_time ||= Puppet::Util::Storage.cache(:configuration)[:compile_time] rescue => detail if Puppet[:trace] puts detail.backtrace @@ -626,7 +626,7 @@ class Puppet::Client::MasterClient < Puppet::Client fromcache = true else @compile_time = Time.now - Puppet::Storage.cache(:configuration)[:compile_time] = @compile_time + Puppet::Util::Storage.cache(:configuration)[:compile_time] = @compile_time end begin |