summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-16Merge branch 'fix/master/where_did_facts_dot_d_go'Jeff McCune
2012-08-16Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"Jeff McCune
2012-08-16Merge branch 'release/master/three_dot_oh_dot_oh'Jeff McCune
2012-08-16Update CHANGELOG, Modulefile for 3.0.0Jeff McCune
2012-08-16(Maint) Update README for 3.0.0Jeff McCune
2012-08-16Merge branch 'bodepd-ensure_resource_attempt_2'Jeff McCune
2012-08-15Explicitly load functions used by ensure_resourceDan Bode
2012-08-15Revert "Revert "Merge pull request #86 from bodepd/ensure_resource""Dan Bode
2012-08-14Revert "Merge pull request #86 from bodepd/ensure_resource"Jeff McCune
2012-08-14Merge pull request #86 from bodepd/ensure_resourceJeff McCune
2012-08-14Merge branch '2.4.x'Jeff McCune
2012-08-14Update Modulefile, CHANGELOG for 2.4.0Jeff McCune
2012-08-14Merge branch '2.4.x'Jeff McCune
2012-08-14Merge branch 'feature/2.4.x/backport_file_line_match_pr75' into 2.4.xJeff McCune
2012-08-14Add support for a 'match' parameter to file_lineChris Price
2012-08-14Merge branch '2.4.x'Jeff McCune
2012-08-14Merge branch 'feature/2.4.x/to_bytes_function' into 2.4.xJeff McCune
2012-08-14(#15872) Add to_bytes functionErik Dalén
2012-08-13re-formattingDan Bode
2012-08-13Add better docs about duplicate resource failuresDan Bode
2012-08-13Handle undef for parameter argumentDan Bode
2012-08-13Add function ensure_resource and defined_with_paramsDan Bode
2012-08-10Merge branch '2.4.x'Patrick Carlisle
2012-08-10(Maint) use PuppetlabsSpec::PuppetInternals.scope (master)Jeff McCune
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.4.x'Patrick 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 'fix/master/fix_scope_dependency'Jeff McCune
2012-07-23(Maint) use PuppetlabsSpec::PuppetInternals.scope (master)Jeff McCune
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 pull request #77 from hkenney/ticket/2.4.x/2157_add_external_fact_compa...Jeff 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) Make facts_dot_d compatible with external factsHailee Kenney