From: Peter Palfrader Date: Sun, 21 Feb 2010 16:04:32 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bccfb3abe3fdd59e6053071fe8a9ba4c58882c02;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet: add draghi as dbmaster split nagios, munin, and db hosts into seperate v4 and v6 defs, and provide the superset as well --- bccfb3abe3fdd59e6053071fe8a9ba4c58882c02