summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/server
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-07-04 23:04:21 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-07-04 23:04:21 +0000
commitc22e6670ec4981481fba3ed96ac15ae36c1c5c9c (patch)
treedc3ec91cbe25105d57fc0c289f45c391384610d2 /lib/puppet/network/server
parent50b8f96f7682d8da83996957aa884044705daf33 (diff)
downloadpuppet-c22e6670ec4981481fba3ed96ac15ae36c1c5c9c.tar.gz
puppet-c22e6670ec4981481fba3ed96ac15ae36c1c5c9c.tar.xz
puppet-c22e6670ec4981481fba3ed96ac15ae36c1c5c9c.zip
Applying patch by daikinee from #690. I was not able to reproduce the problems, but it did not seem to hurt anything, either.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2649 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/network/server')
-rw-r--r--lib/puppet/network/server/mongrel.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/server/mongrel.rb b/lib/puppet/network/server/mongrel.rb
index c42a7fadd..3294ae274 100644
--- a/lib/puppet/network/server/mongrel.rb
+++ b/lib/puppet/network/server/mongrel.rb
@@ -30,8 +30,8 @@
require 'rubygems'
require 'mongrel'
require 'xmlrpc/server'
-require 'puppet/network/server'
require 'puppet/network/xmlrpc/server'
+require 'puppet/network/server'
require 'puppet/network/client_request'
require 'resolv'