summaryrefslogtreecommitdiff
path: root/lib/puppet
AgeCommit message (Collapse)Author
2010-09-02Merge remote branch 'immerda/master'Micah Anderson
Conflicts: lib/puppet/parser/functions/gsub.rb lib/puppet/parser/functions/prefix_with.rb lib/puppet/parser/functions/sha1.rb lib/puppet/parser/functions/slash_escape.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-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