diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-01-11 11:45:58 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-01-11 11:45:58 -0800 |
| commit | bf2b07158f5e4e16e7a1a52e84257ae5d84d9e1c (patch) | |
| tree | cf51e75f954847fda264b561a7a3acdfa5869dda /lib/puppet/network/http/handler.rb | |
| parent | e6e88e7df7fa1cbec1400d73cb7ba9428c420be0 (diff) | |
| parent | a002231f45339da9b152162c2f48126d95e2e246 (diff) | |
| download | puppet-bf2b07158f5e4e16e7a1a52e84257ae5d84d9e1c.tar.gz puppet-bf2b07158f5e4e16e7a1a52e84257ae5d84d9e1c.tar.xz puppet-bf2b07158f5e4e16e7a1a52e84257ae5d84d9e1c.zip | |
Merge branch 'ticket/2.6.next/5171-filebucket-diff' into 2.6.next
* ticket/2.6.next/5171-filebucket-diff:
(#5171) Made filebucket able to perform diffs
Diffstat (limited to 'lib/puppet/network/http/handler.rb')
| -rw-r--r-- | lib/puppet/network/http/handler.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index 61ae2d2fc..f22498b70 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -109,7 +109,11 @@ module Puppet::Network::HTTP::Handler format = format_to_use(request) set_content_type(response, format) - set_response(response, result.render(format)) + if result.respond_to?(:render) + set_response(response, result.render(format)) + else + set_response(response, result) + end end # Execute our search. |