diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-08-24 15:42:03 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-08-24 15:42:03 -0700 |
| commit | da4a2def42639817c4522fc0162bd691956998da (patch) | |
| tree | 3cb423a7d2a7a803a922b710c661d675d11bf131 /lib/puppet/file_serving | |
| parent | 0d51dc9be0bc1c785d749b8b352a1e43b1b6e9c6 (diff) | |
| parent | 630ec36089e2224fba99b76d76eaf904af13e4d6 (diff) | |
| download | puppet-da4a2def42639817c4522fc0162bd691956998da.tar.gz puppet-da4a2def42639817c4522fc0162bd691956998da.tar.xz puppet-da4a2def42639817c4522fc0162bd691956998da.zip | |
Merge branch '2.7.x'
Conflicts:
lib/puppet/feature/base.rb
lib/puppet/file_serving/configuration.rb
spec/unit/indirector/ssl_file_spec.rb
spec/unit/parser/functions/extlookup_spec.rb
spec/unit/resource/catalog_spec.rb
test/language/ast/variable.rb
Diffstat (limited to 'lib/puppet/file_serving')
| -rw-r--r-- | lib/puppet/file_serving/base.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/configuration.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/content.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/fileset.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/indirection_hooks.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/metadata.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/mount.rb | 4 | ||||
| -rw-r--r-- | lib/puppet/file_serving/terminus_helper.rb | 4 |
8 files changed, 0 insertions, 32 deletions
diff --git a/lib/puppet/file_serving/base.rb b/lib/puppet/file_serving/base.rb index 706f67af9..e936b5e75 100644 --- a/lib/puppet/file_serving/base.rb +++ b/lib/puppet/file_serving/base.rb @@ -1,7 +1,3 @@ -# -# Created by Luke Kanies on 2007-10-22. -# Copyright (c) 2007. All rights reserved. - require 'puppet/file_serving' # The base class for Content and Metadata; provides common diff --git a/lib/puppet/file_serving/configuration.rb b/lib/puppet/file_serving/configuration.rb index d88d57cb0..02bca1bea 100644 --- a/lib/puppet/file_serving/configuration.rb +++ b/lib/puppet/file_serving/configuration.rb @@ -1,7 +1,3 @@ -# -# Created by Luke Kanies on 2007-10-16. -# Copyright (c) 2007. All rights reserved. - require 'monitor' require 'puppet' require 'puppet/file_serving' diff --git a/lib/puppet/file_serving/content.rb b/lib/puppet/file_serving/content.rb index 9cfae7ded..25361c668 100644 --- a/lib/puppet/file_serving/content.rb +++ b/lib/puppet/file_serving/content.rb @@ -1,7 +1,3 @@ -# -# Created by Luke Kanies on 2007-10-16. -# Copyright (c) 2007. All rights reserved. - require 'puppet/indirector' require 'puppet/file_serving' require 'puppet/file_serving/base' diff --git a/lib/puppet/file_serving/fileset.rb b/lib/puppet/file_serving/fileset.rb index b4f1457df..8bc5e256d 100644 --- a/lib/puppet/file_serving/fileset.rb +++ b/lib/puppet/file_serving/fileset.rb @@ -1,7 +1,3 @@ -# -# Created by Luke Kanies on 2007-10-22. -# Copyright (c) 2007. All rights reserved. - require 'find' require 'puppet/file_serving' require 'puppet/file_serving/metadata' diff --git a/lib/puppet/file_serving/indirection_hooks.rb b/lib/puppet/file_serving/indirection_hooks.rb index 2a0dc1792..bdcc8865e 100644 --- a/lib/puppet/file_serving/indirection_hooks.rb +++ b/lib/puppet/file_serving/indirection_hooks.rb @@ -1,7 +1,3 @@ -# -# Created by Luke Kanies on 2007-10-18. -# Copyright (c) 2007. All rights reserved. - require 'uri' require 'puppet/file_serving' diff --git a/lib/puppet/file_serving/metadata.rb b/lib/puppet/file_serving/metadata.rb index 6656b124a..382ac9c96 100644 --- a/lib/puppet/file_serving/metadata.rb +++ b/lib/puppet/file_serving/metadata.rb @@ -1,7 +1,3 @@ -# -# Created by Luke Kanies on 2007-10-16. -# Copyright (c) 2007. All rights reserved. - require 'puppet' require 'puppet/indirector' require 'puppet/file_serving' diff --git a/lib/puppet/file_serving/mount.rb b/lib/puppet/file_serving/mount.rb index 79290ab81..da7102fd8 100644 --- a/lib/puppet/file_serving/mount.rb +++ b/lib/puppet/file_serving/mount.rb @@ -1,7 +1,3 @@ -# -# Created by Luke Kanies on 2007-10-16. -# Copyright (c) 2007. All rights reserved. - require 'puppet/network/authstore' require 'puppet/util/logging' require 'puppet/file_serving' diff --git a/lib/puppet/file_serving/terminus_helper.rb b/lib/puppet/file_serving/terminus_helper.rb index 4da285258..b36ec55f8 100644 --- a/lib/puppet/file_serving/terminus_helper.rb +++ b/lib/puppet/file_serving/terminus_helper.rb @@ -1,7 +1,3 @@ -# -# Created by Luke Kanies on 2007-10-22. -# Copyright (c) 2007. All rights reserved. - require 'puppet/file_serving' require 'puppet/file_serving/fileset' |