From: Peter Palfrader Date: Tue, 19 Jun 2012 17:26:46 +0000 (+0000) Subject: Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=666929f1af1e84153ebc0c8ad3248a1187e31c88 Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet * 'master' of file:///srv/puppet.debian.org/git/dsa-puppet: more ganeti nodes --- 666929f1af1e84153ebc0c8ad3248a1187e31c88