intrigeri
|
001bbc5ff8
|
Merge remote branch 'cmaisonneuve/master'
|
2010-11-10 11:56:59 +01:00 |
|
Jerome Charaoui
|
63322aa305
|
Add multi_source_template function
|
2010-09-24 14:41:07 -04:00 |
|
Micah Anderson
|
63a16ad8c0
|
Merge remote branch 'immerda/master'
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-02 19:04:29 -04:00 |
|
mh
|
97e15ea5a8
|
move plugin directory to fit new 0.25 style
|
2010-09-02 18:11:43 -04:00 |
|
Micah Anderson
|
3ff12051c8
|
move plugin directory to fit new 0.25.x style and update file paths accordingly
|
2009-11-23 11:54:04 -05:00 |
|