diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 10:17:44 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 10:17:44 -0700 |
| commit | b53e7d78e2e87571ae53170e9716b9ccd75da6e2 (patch) | |
| tree | 58489a37bd0ee14b3d053a0e23f9638b4f6205e7 /lib/puppet/reference | |
| parent | 94edd404130b4236f0c65a579857e3a25c5ee17f (diff) | |
| parent | ecf44e4408c168893d74af58a4c7c8606634a844 (diff) | |
| download | puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.tar.gz puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.tar.xz puppet-b53e7d78e2e87571ae53170e9716b9ccd75da6e2.zip | |
Merge commit '2.6.1rc1' into next
Diffstat (limited to 'lib/puppet/reference')
| -rw-r--r-- | lib/puppet/reference/indirection.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/reference/network.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/reference/indirection.rb b/lib/puppet/reference/indirection.rb index 549299b36..d14510c16 100644 --- a/lib/puppet/reference/indirection.rb +++ b/lib/puppet/reference/indirection.rb @@ -1,5 +1,5 @@ require 'puppet/indirector/indirection' -require 'puppet/checksum' +require 'puppet/util/checksums' require 'puppet/file_serving/content' require 'puppet/file_serving/metadata' diff --git a/lib/puppet/reference/network.rb b/lib/puppet/reference/network.rb index a3bff656b..15e4f6769 100644 --- a/lib/puppet/reference/network.rb +++ b/lib/puppet/reference/network.rb @@ -1,3 +1,5 @@ +require 'puppet/network/handler' + network = Puppet::Util::Reference.newreference :network, :depth => 2, :doc => "Available network handlers and clients" do ret = "" Puppet::Network::Handler.subclasses.sort { |a,b| a.to_s <=> b.to_s }.each do |name| |