summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-10Merge branch '2.3.x' into 2.4.xPatrick Carlisle
2012-08-10Merge branch '2.2.x' into 2.3.xPatrick Carlisle
2012-08-10Disable tests that fail on 2.6.x due to #15912Patrick Carlisle
2012-08-09Merge branch '2.3.x' into 2.4.xPatrick Carlisle
2012-08-09Make sure functions are loaded for each testPatrick Carlisle
2012-08-09Merge branch '2.2.x' into 2.3.xPatrick Carlisle
2012-08-09Use rvalue functions correctlyPatrick Carlisle
2012-07-23Merge branch 'maint/2.3.x/fix_rspec_puppet_load_order_issue' into 2.3.xJeff McCune
2012-07-23(Maint) Don't mock with mochaJeff McCune
2012-07-23Merge pull request #80 from jeffmccune/fix/2.3.x/go_greenJeff McCune
2012-07-23(Maint) Fix up the get_module_path parser functionJeff McCune
2012-07-23(Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x)Jeff McCune
2012-07-23Merge branch '2.2.x' into maint/2.3.x/merge_up_2.2.xJeff McCune
2012-07-23Merge pull request #81 from jeffmccune/maint/2.2.x/rename_seams_to_internalsJeff McCune
2012-07-23(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}Jeff McCune
2012-07-19Merge branch 'fix/2.2.x/make_it_green' into 2.2.xJeff McCune
2012-07-19(Maint) use PuppetlabsSpec::PuppetSeams.parser_scopeJeff McCune
2012-07-19(Maint) Fix interpreter linesJeff McCune
2012-07-12Merge pull request #77 from hkenney/ticket/2.4.x/2157_add_external_fact_compa...Jeff McCune
2012-07-10(#2157) Make facts_dot_d compatible with external factsHailee Kenney
2012-05-23Update CHANGELOG, Modulefile for 2.3.3Jeff McCune
2012-05-23Merge pull request #70 from duritong/2.3.xJeff McCune
2012-05-23fix regression in #11017 properlyPeter Meier
2012-05-11Merge branch '2.2.x' into 2.3.xJeff McCune
2012-05-11Fix spec tests using the new spec_helperJeff McCune
2012-05-10Update CHANGELOG for 2.3.2 releaseJeff McCune
2012-05-10Merge branch 'fix/2.3.x/file_line_ensure' into 2.3.xJeff McCune
2012-05-10Make file_line default to ensure => presentJeff McCune
2012-05-10Memoize file_line spec instance variablesJeff McCune
2012-05-10Fix spec tests using the new spec_helperJeff McCune
2012-04-13Merge branch '2.2.x' into 2.3.xJeff McCune
2012-04-04Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_init...Jeff McCune
2012-04-04Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_e...Jeff McCune
2012-04-03(#13595) initialize_everything_for_tests couples modules Puppet verEric Shamow
2012-03-29Merge branch '2.3.x' into 2.4.xJeff McCune
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try3' into 2.2.xJeff McCune
2012-03-29(#13439) Fix MRI 1.9 issue with spec_helperJeff McCune
2012-03-29Merge branch '2.3.x' into 2.4.xJeff McCune
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper_try2' into 2.2.xJeff McCune
2012-03-29(#13439) Fix test failures with Puppet 2.6.xJeff McCune
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
2012-03-29Merge branch 'ticket/2.2.x/13439_fix_spec_helper' into 2.2.xJeff McCune
2012-03-29(#13439) refactor spec helper for compatibility with both puppet 2.7 andcprice
2012-03-29Merge pull request #53 from traylenator/fqdn_rotateJeff McCune
2012-03-29Merge branch '2.3.x'Jeff McCune
2012-03-29Merge branch '2.2.x' into 2.3.xJeff McCune
2012-03-29Merge branch '2.1.x' into 2.2.xJeff McCune
2012-03-29Merge branch 'maint/2.2.x/range_spec_tests' into 2.2.xJeff McCune