]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94a1ed6 cec5489)
Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 17:26:46 +0000 (17:26 +0000)
committerPeter Palfrader <peter@palfrader.org>
Tue, 19 Jun 2012 17:26:46 +0000 (17:26 +0000)
* 'master' of file:///srv/puppet.debian.org/git/dsa-puppet:
  more ganeti nodes


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.