puppet/munin
Ossi Salmi 98767cfb2a Merge tmakinen/puppet
Conflicts:
	dovecot/manifests/init.pp
	libvirt/manifests/init.pp
	munin/manifests/init.pp
	puppet/manifests/init.pp
	tftp/manifests/init.pp
2012-11-16 19:40:31 +02:00
..
files Removed munin_cgi_graph_jobs from munin.conf 2012-10-09 14:50:58 +03:00
manifests Merge tmakinen/puppet 2012-11-16 19:40:31 +02:00
templates Removed munin_cgi_graph_jobs from munin.conf 2012-10-09 14:50:58 +03:00