From: Peter Palfrader Date: Tue, 19 Jun 2012 17:22:11 +0000 (+0000) Subject: Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=94a1ed63ad00ffb022307d4d91408e6cc3c0406a;p=mirror%2Fdsa-puppet.git Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet * 'master' of file:///srv/puppet.debian.org/git/dsa-puppet: Add more IP addresses to HOST_GANETI_* variables --- 94a1ed63ad00ffb022307d4d91408e6cc3c0406a