module-common/manifests/defines
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
..
append_if_no_such_line.pp Add append_if_no_such_line compatablity define 2009-07-13 10:52:34 +02:00
concatenated_file.pp escaping 2010-09-02 18:29:12 -04:00
config_file.pp Merge remote branch 'immerda/master' 2010-09-02 19:04:29 -04:00
line.pp Merge remote branch 'immerda/master' 2010-09-02 19:04:29 -04:00
link.pp make the define much easier 2010-09-02 18:14:02 -04:00
module_dir.pp Merge remote branch 'immerda/master' 2010-09-02 19:04:29 -04:00
module_file.pp Merge remote branch 'immerda/master' 2010-09-02 19:04:29 -04:00
replace.pp Merge remote branch 'immerda/master' 2010-09-02 19:04:29 -04:00