diff options
| author | Rick Bradley <rick@rickbradley.com> | 2007-10-22 09:35:34 -0500 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2007-10-22 09:35:34 -0500 |
| commit | b134f0ce465923a6b0b7f2855850e38599f0f176 (patch) | |
| tree | 3d917856225c904f3496c2be145ddf84d04db666 /lib/puppet/network | |
| parent | e69a50afbe0c031833c4247a962cfda0b5996d78 (diff) | |
| parent | 08099b7a383987e292357f285e05933e10205660 (diff) | |
| download | puppet-b134f0ce465923a6b0b7f2855850e38599f0f176.tar.gz puppet-b134f0ce465923a6b0b7f2855850e38599f0f176.tar.xz puppet-b134f0ce465923a6b0b7f2855850e38599f0f176.zip | |
Merge branch 'master' of git://reductivelabs.com/puppet into routing
Conflicts:
spec/unit/indirector/indirection.rb
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/http/handler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index 0d4be3a8d..4365fffca 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -6,7 +6,7 @@ class Puppet::Network::HTTP::Handler register_handler end - # handle an HTTP request coming from Mongrel + # handle an HTTP request def process(request, response) return do_find(request, response) if get?(request) and singular?(request) return do_search(request, response) if get?(request) and plural?(request) |