projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5c53f7b
22948d6
)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
author
Peter Palfrader
<peter@palfrader.org>
Sun, 21 Feb 2010 16:04:32 +0000
(17:04 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Sun, 21 Feb 2010 16:04:32 +0000
(17:04 +0100)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
add draghi as dbmaster
split nagios, munin, and db hosts into seperate v4 and v6 defs, and provide the superset as well
Trivial merge