summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLuke Kanies <luke@reductivelabs.com>2010-01-21 23:13:52 -0800
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit61636e4a15c365f57bc510fd601b1ac6be460614 (patch)
tree4623cdddf69d2782c65e251efd029f5f32d96142 /lib
parent7a99a1db262aa41dfe48ea38d1cc86ca0beb2696 (diff)
downloadpuppet-61636e4a15c365f57bc510fd601b1ac6be460614.tar.gz
puppet-61636e4a15c365f57bc510fd601b1ac6be460614.tar.xz
puppet-61636e4a15c365f57bc510fd601b1ac6be460614.zip
Tuning file load order
Signed-off-by: Luke Kanies <luke@reductivelabs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet.rb2
-rw-r--r--lib/puppet/util/settings.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index 0904f044a..2e531ad75 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -152,6 +152,8 @@ end
require 'puppet/type'
require 'puppet/parser'
+require 'puppet/resource'
+require 'puppet/resource/reference'
require 'puppet/network'
require 'puppet/ssl'
require 'puppet/module'
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index dd85342c0..f50d46642 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -4,6 +4,8 @@ require 'getoptlong'
require 'puppet/external/event-loop'
require 'puppet/util/cacher'
require 'puppet/util/loadedfile'
+require 'puppet/resource'
+require 'puppet/resource/reference'
# The class for handling configuration files.
class Puppet::Util::Settings