diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-17 15:19:15 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-17 15:19:15 -0800 |
| commit | e6ec6468c4a9eec58dc155858665a70eee4dfb8c (patch) | |
| tree | 85cdb7614a1922752ff652b93f2947ef231fa8fb /lib/puppet/network/handler | |
| parent | fb2b9e65990477e81728402afa1aab6fbe4a9c7e (diff) | |
| parent | 53bb805f118ccaca5598e60afadfa6b777410a0f (diff) | |
| download | puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.tar.gz puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.tar.xz puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.zip | |
Merge commit '2.6.3' into next
Resolved conflicts manually:
spec/integration/indirector/bucket_file/rest_spec.rb
spec/integration/indirector/certificate_revocation_list/rest_spec.rb
Diffstat (limited to 'lib/puppet/network/handler')
| -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 8844ab990..9abc7ee1a 100755 --- a/lib/puppet/network/handler/fileserver.rb +++ b/lib/puppet/network/handler/fileserver.rb @@ -6,6 +6,8 @@ require 'delegate' require 'sync' require 'xmlrpc/server' +require 'puppet/network/handler' +require 'puppet/network/xmlrpc/server' require 'puppet/file_serving' require 'puppet/file_serving/metadata' require 'puppet/network/handler' |