diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-10 16:05:15 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-10 16:06:04 -0800 |
| commit | 2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78 (patch) | |
| tree | d7c11657d0bfd44488b235c95819f62f7431b949 /lib/puppet/network/handler/fileserver.rb | |
| parent | 7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b (diff) | |
| parent | 275a224ee245577c4213b3a21bf1e98301740a4e (diff) | |
| download | puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.tar.gz puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.tar.xz puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.zip | |
Merge branch 'next'
This marks the end of the agile iteration from 11/3-11/10.
Diffstat (limited to 'lib/puppet/network/handler/fileserver.rb')
| -rwxr-xr-x | lib/puppet/network/handler/fileserver.rb | 2 |
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 |