diff options
| author | Luke Kanies <luke@madstop.com> | 2008-09-23 23:50:43 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-09-23 23:50:43 -0500 |
| commit | bb23861e334e617b544c11bc75a35c40b36185a2 (patch) | |
| tree | 18da91858e4fded78a56d673fc69014fdf266676 /lib/puppet/network/handler | |
| parent | e31df2f7f5e98c524b68cd724cfaa3e308e7b9a1 (diff) | |
| parent | ac5db5ec115455e54090542870847820357739a2 (diff) | |
| download | puppet-bb23861e334e617b544c11bc75a35c40b36185a2.tar.gz puppet-bb23861e334e617b544c11bc75a35c40b36185a2.tar.xz puppet-bb23861e334e617b544c11bc75a35c40b36185a2.zip | |
Merge branch 'feature/master/1481'
This merges in the new fileserving code -- we're now using
REST to do fileserving, rather than xmlrpc.
Conflicts:
lib/puppet/parameter.rb
lib/puppet/type/file.rb
spec/unit/type/file.rb
Diffstat (limited to 'lib/puppet/network/handler')
| -rwxr-xr-x | lib/puppet/network/handler/fileserver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb index 183979429..14319ef96 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -75,7 +75,7 @@ class Puppet::Network::Handler return "" unless metadata.exist? begin - metadata.collect_attributes + metadata.collect rescue => detail puts detail.backtrace if Puppet[:trace] Puppet.err detail |