summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Berry <paul@puppetlabs.com>2010-11-09 12:08:55 -0800
committerPaul Berry <paul@puppetlabs.com>2010-11-09 12:08:55 -0800
commita54850328bded4e6d0ee456eda6c5254dfc379a2 (patch)
tree1f738fbea9ecbb52be1e5bea2fd21037e7fba5d1
parent442a2e6b81f8cdcd2dc0ad24c7c2c66873148e25 (diff)
parent2ec1b552e24d3b42391a6471e477422f67ea00bd (diff)
downloadpuppet-a54850328bded4e6d0ee456eda6c5254dfc379a2.tar.gz
puppet-a54850328bded4e6d0ee456eda6c5254dfc379a2.tar.xz
puppet-a54850328bded4e6d0ee456eda6c5254dfc379a2.zip
Merge branch 'maint/next/missing_fileserver_requires' into next
-rwxr-xr-xlib/puppet/network/handler/fileserver.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb
index 27b913ab9..8844ab990 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -4,9 +4,11 @@ require 'webrick/httpstatus'
require 'cgi'
require 'delegate'
require 'sync'
+require 'xmlrpc/server'
require 'puppet/file_serving'
require 'puppet/file_serving/metadata'
+require 'puppet/network/handler'
class Puppet::Network::Handler
AuthStoreError = Puppet::AuthStoreError