Ossi Salmi 49a8ae3004 Merge branch 'puppet3' ... Conflicts: ntpd/templates/ntp.conf.erb wiki/templates/collab-wsgi.conf.erb		2013-05-24 10:10:57 +03:00
..
files	Added CentOS/RedHat support to snmp::trapd.	2013-04-24 23:53:24 +03:00
manifests	snmp: Fixed syntax errors when using older puppet.	2013-05-09 01:20:16 +03:00
templates	Updated all templates to use instance variables	2013-05-05 00:07:55 +03:00