summaryrefslogtreecommitdiff
path: root/lib/puppet
AgeCommit message (Collapse)Author
2011-02-14Merge branch 'master' of git://labs.riseup.net/shared-commonSilvio Rhatto
Conflicts: lib/puppet/parser/functions/gsub.rb lib/puppet/parser/functions/prefix_with.rb lib/puppet/parser/functions/slash_escape.rb lib/puppet/parser/functions/split.rb lib/puppet/parser/functions/substitute.rb manifests/classes/lsb_release.pp manifests/defines/concatenated_file.pp manifests/defines/config_file.pp manifests/defines/line.pp manifests/defines/module_dir.pp manifests/defines/module_file.pp manifests/defines/replace.pp manifests/init.pp
2010-11-30Merge remote branch 'lavamind/master'mh
2010-11-07add a new function & tests for that functionmh
2010-11-07go on uniq stringsmh
Looks like puppet has some internal representation which is not comparable.
2010-11-07add a function to do some array workmh
2010-11-07add a join functionmh
2010-11-07remove some legacy functions that are now in upstreammh
2010-09-24Add multi_source_template functionJerome Charaoui
2010-09-02move plugin directory to fit new 0.25 stylemh
2009-11-23move plugin directory to fit new 0.25.x style and update file paths accordinglyMicah Anderson