module-common/manifests
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
..
defines Merge remote branch 'immerda/master' 2010-09-02 19:04:29 -04:00
moduledir refactoring the last part of moduledirs 2010-09-02 18:17:35 -04:00
init.pp Merge remote branch 'immerda/master' 2010-09-02 19:04:29 -04:00
moduledir.pp remove unnecessary fileserver variable (#2460) 2010-09-02 18:29:17 -04:00