diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 15:59:52 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-07-23 15:59:52 -0700 |
| commit | 243c7c2a499697654101af726f1f47d367e41c13 (patch) | |
| tree | 855d07f105866afbb26f5e093997a7d5f295e408 /lib/puppet/parser/functions/empty.rb | |
| parent | cc414a422de0d773a1012ca57f41f15b4d6caf06 (diff) | |
| parent | effdfb845092fbe549c286926ac686aab1746a12 (diff) | |
Merge branch '2.3.x'
* 2.3.x:
(Maint) Don't mock with mocha
(Maint) Fix up the get_module_path parser function
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)
(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}
(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope
(Maint) Fix interpreter lines
Conflicts:
spec/spec_helper.rb
spec/unit/puppet/parser/functions/get_module_path_spec.rb
Diffstat (limited to 'lib/puppet/parser/functions/empty.rb')
0 files changed, 0 insertions, 0 deletions