summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-01-02Merge remote-tracking branch 'shared/master'HEADmastermh
2012-12-12Merge pull request #38 from jpoppe/masterR.I.Pienaar
2012-12-12added description of replace in the comment blockJasper Poppe
2012-12-12added (file) $replace parameter to concatJasper Poppe
2012-11-06Merge pull request #35 from Zugschlus/masterR.I.Pienaar
2012-11-06gracefully handle \n in fragment resource nameMarc Haber
2012-11-06refer to manifest files for option docsMarc Haber
2012-09-04fix markupR.I.Pienaar
2012-09-04Prepare for version 0.2.0R.I.Pienaar
2012-08-30Merge pull request #32 from UnifiedPost/developR.I.Pienaar
2012-08-30Fixes various puppet-lint warnings.Jan Vansteenkiste
2012-08-30Merge pull request #31 from UnifiedPost/developR.I.Pienaar
2012-08-30Document the path parameter and provide a small use case.Jan Vansteenkiste
2012-08-30Add a second spec test for the name/path combinationJan Vansteenkiste
2012-08-30Allow overriding the target path of a (concat) file and use a custom name.Jan Vansteenkiste
2012-08-14Merge pull request #29 from x-way/masterR.I.Pienaar
2012-08-14Add puppet-lint and rspec-puppet gem for Travis CIAndreas Jaggi
2012-08-14Merge pull request #28 from x-way/masterR.I.Pienaar
2012-08-14Remove trailing whitespace in commentAndreas Jaggi
2012-07-11Merge pull request #27 from djmitche/auto-setupR.I.Pienaar
2012-07-11Include concat::setup from concat, so users don't need toDustin J. Mitchell
2012-07-11Merge pull request #26 from djmitche/patch-1R.I.Pienaar
2012-07-11Remove spurious 'e' character.Dustin J. Mitchell
2012-06-28Merge pull request #25 from branan/module_package_nameR.I.Pienaar
2012-06-28Fix module name to make the PMT happierBranan Purvine-Riley
2012-06-23Merge pull request #24 from pabelanger/improvementsR.I.Pienaar
2012-06-23Reformatting for puppet-lintPaul Belanger
2012-06-23Add Travis CI supportPaul Belanger
2012-06-23Lets use puppetlabs_spec_helperPaul Belanger
2012-06-20update README.markdown to clearly indicate how to start using the concat moduleMicah Anderson
2012-05-31Merge pull request #23 from sathlan/feature/add-basic-testsR.I.Pienaar
2012-05-31Cleanup.sathlan
2012-05-31Adding basic tests.sathlan
2012-05-29Merge branch 'master' of github.com:ripienaar/puppet-concatR.I.Pienaar
2012-05-23Merge pull request #21 from mrwacky42/basedir_warningR.I.Pienaar
2012-05-23Fail with helpful advice if $::concat_basedir is not yet setSharif Nassar
2012-05-20Merge pull request #20 from endemics/masterR.I.Pienaar
2012-05-20add information about concat_basedir and the need for pluginsync = true at le...Gildas Le Nadan
2012-04-30add files needed for the module forgeR.I.Pienaar
2012-04-24Merge pull request #18 from dalen/masterR.I.Pienaar
2012-04-24Style guideline fixesErik Dalén
2012-04-17Merge pull request #17 from pdxcat/refactor_remove_gnuflagR.I.Pienaar
2012-04-17Remove the gnu parameter from concatReid Vandewiele
2011-12-14Fix comments to match actual behavior, clean up old script.Sharif Nassar
2011-12-13Merge pull request #12 from mrwacky42/masterR.I.Pienaar
2011-12-13Remove silly environment variable that corrupts reality.Sharif Nassar
2011-12-06Merge pull request #11 from cwarden/fully-qualifyR.I.Pienaar
2011-12-05Fix use of unqualified variable namesChristian G. Warden
2011-08-03Merge pull request #8 from duritong/masterR.I.Pienaar
2011-08-03Merge remote-tracking branch 'ripienaar/master'Peter Meier
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 02:39:43 +0000