diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-13 15:01:13 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-13 15:01:13 -0700 |
| commit | a8e4df735abcbb61915c28378f2fd045bdcdeb42 (patch) | |
| tree | a05a61d4ca514ef466bccc8217a6d61b5cd4ca4c /spec/unit/application/indirection_base_spec.rb | |
| parent | 82fb02ce27c95d8326335a8d52a9ab7e676fe8d3 (diff) | |
| parent | 4b7afaa065383c4a441068a15f97ab82d2ebd3fc (diff) | |
| download | puppet-a8e4df735abcbb61915c28378f2fd045bdcdeb42.tar.gz puppet-a8e4df735abcbb61915c28378f2fd045bdcdeb42.tar.xz puppet-a8e4df735abcbb61915c28378f2fd045bdcdeb42.zip | |
Merge branch '2.7.next' into next
* 2.7.next:
Revert "(#7220) Add the ability to "inherit" options."
(#7469) Add license to test face so tests pass
(#7264) Docs: Clarify that subscribe/notify imply require/before
(#7468) Stub spec that tries to connect to pypi.python.org
Prevent spec failure caused by network device mock leak
Fix #7299 - do not require net/ssh for running rake spec
Diffstat (limited to 'spec/unit/application/indirection_base_spec.rb')
| -rwxr-xr-x | spec/unit/application/indirection_base_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/unit/application/indirection_base_spec.rb b/spec/unit/application/indirection_base_spec.rb index 910774c14..d72def6cf 100755 --- a/spec/unit/application/indirection_base_spec.rb +++ b/spec/unit/application/indirection_base_spec.rb @@ -10,6 +10,8 @@ end face = Puppet::Indirector::Face.define(:testindirection, '0.0.1') do summary "fake summary" + copyright "Puppet Labs", 2011 + license "Apache 2 license; see COPYING" end # REVISIT: This horror is required because we don't allow anything to be # :current except for if it lives on, and is loaded from, disk. --daniel 2011-03-29 |