diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-28 15:59:49 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-28 15:59:49 -0600 |
| commit | 8df0c1ba76b3fab2ebafb3682a2364561ba6e82a (patch) | |
| tree | 7c4e9d817f57452cbee9213cb602c67528fa8f18 /lib | |
| parent | abd688ea1a0ebd555eac20185d82cc6430507edf (diff) | |
| parent | 82b02b90493f0abc173ec4cc09948106ae5190cd (diff) | |
| download | puppet-8df0c1ba76b3fab2ebafb3682a2364561ba6e82a.tar.gz puppet-8df0c1ba76b3fab2ebafb3682a2364561ba6e82a.tar.xz puppet-8df0c1ba76b3fab2ebafb3682a2364561ba6e82a.zip | |
Merge branch '0.24.x' of ssh://reductivelabs.com/opt/rl/git/puppet into 0.24.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/file_serving/file_base.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/network/client.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/file_serving/file_base.rb b/lib/puppet/file_serving/file_base.rb index 06b3ad9ef..e87d683aa 100644 --- a/lib/puppet/file_serving/file_base.rb +++ b/lib/puppet/file_serving/file_base.rb @@ -46,6 +46,7 @@ class Puppet::FileServing::FileBase # Determine how we deal with links. attr_reader :links def links=(value) + value = :manage if value == :ignore raise(ArgumentError, ":links can only be set to :manage or :follow") unless [:manage, :follow].include?(value) @links = value end diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb index 0a0a72345..cf1782f79 100644 --- a/lib/puppet/network/client.rb +++ b/lib/puppet/network/client.rb @@ -7,6 +7,8 @@ require 'puppet/util/subclass_loader' require 'puppet/util/methodhelper' require 'puppet/sslcertificates/support' +require 'puppet/network/handler' + require 'net/http' # Some versions of ruby don't have this method defined, which basically causes |