summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-03-27Update README.markdownGoT
2014-03-25Merge branch '4.x'Adrien Thebo
2014-03-25Merge branch '3.x' into 4.xAdrien Thebo
2014-03-25Merge branch '3.2.x' into 3.xAdrien Thebo
2014-03-25Merge branch 'maint/3.2.x-ruby-rake-1.8-compat' into 3.2.xAdrien Thebo
2014-03-25(maint) Pin rake version to 10.1.0 for 1.8 compatAdrien Thebo
2014-03-18Merge branch '4.x'Hunter Haugen
2014-03-18Merge branch '3.x' into 4.xHunter Haugen
2014-03-18Merge branch '3.2.x' into 3.xHunter Haugen
2014-03-18Merge pull request #231 from apenney/32-testingAshley Penney
2014-03-13Remove this test.Ashley Penney
2014-03-12Merge pull request #234 from apenney/add-beakerAshley Penney
2014-03-12Add beaker framework.Ashley Penney
2014-03-11Merge pull request #220 from mediatemple/fix/master/deep_merge_fixAshley Penney
2014-03-11Merge pull request #221 from puphpet/hash-fixAshley Penney
2014-03-11Ensure Gemfile retains facilities for Jenkins.Ashley Penney
2014-03-10Merge pull request #233 from apenney/add-back-locationAshley Penney
2014-03-10Make sure location_for is used when installing Puppet.Ashley Penney
2014-03-10Merge pull request #232 from apenney/add-back-locationAshley Penney
2014-03-10Readd location_forAshley Penney
2014-03-10Remove pry, whoops.Ashley Penney
2014-03-10Numerous changes to update testing gems.Ashley Penney
2014-03-07Merge pull request #230 from apenney/fix-testingAshley Penney
2014-03-08Numerous changes to update testing gems.Ashley Penney
2014-03-03Merge pull request #228 from hunner/fix_metadataAshley Penney
2014-03-03Patch metadataHunter Haugen
2014-03-03Merge pull request #227 from hunner/add_supportAshley Penney
2014-03-03Supported Release 3.2.1Hunter Haugen
2014-03-03Merge pull request #226 from apenney/supported-metadataHunter Haugen
2014-03-03Prepare for supported modules.Ashley Penney
2014-02-19hash example has misplaced comasJuan Treminio
2014-02-17PUP-1724 Don't modify the paramaters to deep_mergeJustin Burnham
2014-02-11Merge pull request #217 from teancom/fix/master/file_lineAshley Penney
2014-02-11Merge pull request #219 from petems/patch-1Ashley Penney
2014-02-11Fix strftime documentation in READMEPeter Souter
2014-02-05Merge pull request #218 from mediatemple/remove_trailing_whitespaceHunter Haugen
2014-02-05Remove trailing whitespaceSharif Nassar
2014-01-29Merge branch 'DavidS-broaden-pick-arguments2'Andrew Parker
2014-01-29(PUP-638) Add a pick_default() function that always returns a value.David Schmitt
2014-01-29(PUP-636) Ignore generated fileDavid Schmitt
2014-01-28Merge pull request #215 from blkperl/add_root_home_to_mavericksAndrew Parker
2014-01-25(DOCUMENT-21) add docs for file_line to README.markdownDavid Bishop
2014-01-24(PUP-1195) Rephrase documentation for is_integer and is_numericHenrik Lindberg
2014-01-23(PUP-1195) Fix is_numeric/is_integer when checking non-string parametersSimon Effenberg
2014-01-23Merge pull request #216 from ghoneycutt/enable_travis_fast_finishHunter Haugen
2014-01-23Enable fast finish in TravisGarrett Honeycutt
2014-01-22(PUP-1459) Add support for root_home on OS X 10.9William Van Hevelingen
2014-01-15Merge branch 'pull-201'Adrien Thebo
2014-01-15(maint) Update ensure_package specs to confirm expected behaviorAdrien Thebo
2014-01-15(maint) refactor ensure_packages for clarityAdrien Thebo