projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
89d2ffe
546ca0c
)
Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet
author
Peter Palfrader
<peter@palfrader.org>
Tue, 19 Jun 2012 17:22:11 +0000
(17:22 +0000)
committer
Peter Palfrader
<peter@palfrader.org>
Tue, 19 Jun 2012 17:22:11 +0000
(17:22 +0000)
* 'master' of file:///srv/puppet.debian.org/git/dsa-puppet:
Add more IP addresses to HOST_GANETI_* variables
Trivial merge