diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 09:00:11 -0700 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 09:00:11 -0700 |
commit | f3caf5f49383344228482b93ad533d06244a3cac (patch) | |
tree | 9144840436f9aba8d14313ad5c26bb59c6cb5d80 /spec/unit/facter/util/puppet_settings_spec.rb | |
parent | 730aee4ef999b73a16d13a6792e10343dbdcabea (diff) | |
parent | a1bab586ba6fcf2b3035898d1002d0a6ef89d7c8 (diff) | |
download | puppet-stdlib-f3caf5f49383344228482b93ad533d06244a3cac.tar.gz puppet-stdlib-f3caf5f49383344228482b93ad533d06244a3cac.tar.bz2 |
Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.x
* 2.2.x:
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
(Maint) Fix interpreter lines
Diffstat (limited to 'spec/unit/facter/util/puppet_settings_spec.rb')
0 files changed, 0 insertions, 0 deletions