From: Peter Palfrader Date: Tue, 19 Jun 2012 17:31:23 +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=97c21cd3ff0b45bdb4bdb92e4054231a7e845328 Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet * 'master' of file:///srv/puppet.debian.org/git/dsa-puppet: dedicated ganeti ssh chain --- 97c21cd3ff0b45bdb4bdb92e4054231a7e845328