From: Patrick Carlisle Date: Thu, 9 Aug 2012 21:52:08 +0000 (-0700) Subject: Merge branch '2.3.x' into 2.4.x X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cdd45298337df80aad757e81eb7457317219c1b7;p=puppet-stdlib.git Merge branch '2.3.x' into 2.4.x * 2.3.x: Make sure functions are loaded for each test Use rvalue functions correctly (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 Update CHANGELOG, Modulefile for 2.3.3 fix regression in #11017 properly Fix spec tests using the new spec_helper Update CHANGELOG for 2.3.2 release Make file_line default to ensure => present Memoize file_line spec instance variables Fix spec tests using the new spec_helper Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x" (#13595) initialize_everything_for_tests couples modules Puppet ver --- cdd45298337df80aad757e81eb7457317219c1b7