diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-29 12:00:39 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-29 12:00:39 -0600 |
| commit | 4c3fa7806d12f86fce01030aa5e3745e698cb3c0 (patch) | |
| tree | c2dd3a9fafb2da8c109ba3d107a9e3eef811f004 | |
| parent | 857814ac80cf4f0c9913ccb6d2d42355670ea64f (diff) | |
| download | puppet-4c3fa7806d12f86fce01030aa5e3745e698cb3c0.tar.gz puppet-4c3fa7806d12f86fce01030aa5e3745e698cb3c0.tar.xz puppet-4c3fa7806d12f86fce01030aa5e3745e698cb3c0.zip | |
Fixing a few more loading order issues.
| -rwxr-xr-x | bin/puppetmasterd | 1 | ||||
| -rw-r--r-- | lib/puppet.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/network.rb | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/bin/puppetmasterd b/bin/puppetmasterd index a00186b68..33e4f436d 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -81,6 +81,7 @@ end require 'getoptlong' require 'puppet' +require 'puppet/network/handler' require 'puppet/sslcertificates' options = [ diff --git a/lib/puppet.rb b/lib/puppet.rb index 18037cdc1..57f84d5f7 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -423,6 +423,7 @@ module Puppet end require 'puppet/type' +require 'puppet/network' require 'puppet/module' require 'puppet/util/storage' require 'puppet/parser/interpreter' diff --git a/lib/puppet/network.rb b/lib/puppet/network.rb new file mode 100644 index 000000000..8993b8869 --- /dev/null +++ b/lib/puppet/network.rb @@ -0,0 +1,3 @@ +# Just a stub, so we can correctly scope other classes. +module Puppet::Network # :nodoc: +end |