Jeff McCune 243c7c2a49 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		2012-07-23 15:59:52 -07:00
..
facter	(#2157) Remove facter_dot_d for compatibility with external facts	2012-07-10 12:00:31 -07:00
puppet	Merge branch '2.3.x'	2012-07-23 15:59:52 -07:00