summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-07-23Merge branch '2.3.x'Jeff McCune
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 branch 'hkenney-ticket/master/2157_remove_facts_dot_d'Jeff McCune
2012-07-12(#2157) Update README about facts_dot_dJeff McCune
2012-07-10(#2157) Remove facter_dot_d for compatibility with external factsHailee Kenney
2012-06-26Merge pull request #73 from branan/use_spechelper_gemChris Price
2012-06-10Merge pull request #75 from cprice-puppet/feature/master/regex-support-for-fi...Jeff McCune
2012-06-07Add support for a 'match' parameter to file_lineChris Price
2012-05-31Require the new puppetlabs_spec_helper gem nameBranan Purvine-Riley
2012-05-29Update for new gem version of puppetlabs_spec_helperBranan Purvine-Riley
2012-05-23Merge branch '2.3.x'Jeff McCune
2012-05-23Update CHANGELOG, Modulefile for 2.3.3Jeff McCune
2012-05-23Merge branch '2.3.x'Jeff 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.3.x'Jeff McCune
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-10Merge branch '2.3.x'Jeff 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.3.x'Jeff McCune
2012-04-13Merge branch '2.2.x' into 2.3.xJeff McCune
2012-04-11Merge pull request #61 from cprice-puppet/ticket/master/13693-use-puppetlabs-...Chris Price
2012-04-11(#13693) moving logic from local spec_helper to puppetlabs_spec_helperChris Price
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.4.x'Jeff 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_try3' into 2.2.xJeff McCune
2012-03-29(#13439) Fix MRI 1.9 issue with spec_helperJeff McCune
2012-03-29Merge branch '2.4.x'Jeff 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