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 /spec/unit/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 'spec/unit/file_serving')
| -rwxr-xr-x | spec/unit/file_serving/indirection_hooks_spec.rb | 4 | ||||
| -rwxr-xr-x | spec/unit/file_serving/terminus_helper_spec.rb | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/spec/unit/file_serving/indirection_hooks_spec.rb b/spec/unit/file_serving/indirection_hooks_spec.rb index 4890505ab..526c49e0f 100755 --- a/spec/unit/file_serving/indirection_hooks_spec.rb +++ b/spec/unit/file_serving/indirection_hooks_spec.rb @@ -1,8 +1,4 @@ #!/usr/bin/env rspec -# -# Created by Luke Kanies on 2007-10-18. -# Copyright (c) 2007. All rights reserved. - require 'spec_helper' require 'puppet/file_serving/indirection_hooks' diff --git a/spec/unit/file_serving/terminus_helper_spec.rb b/spec/unit/file_serving/terminus_helper_spec.rb index 7efe3fb98..9fd27d9dc 100755 --- a/spec/unit/file_serving/terminus_helper_spec.rb +++ b/spec/unit/file_serving/terminus_helper_spec.rb @@ -1,8 +1,4 @@ #!/usr/bin/env rspec -# -# Created by Luke Kanies on 2007-10-22. -# Copyright (c) 2007. All rights reserved. - require 'spec_helper' require 'puppet/file_serving/terminus_helper' |