]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 16:04:32 +0000 (17:04 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 16:04:32 +0000 (17:04 +0100)
commitbccfb3abe3fdd59e6053071fe8a9ba4c58882c02
tree667e9c1b6215ecd83155f07a2b84a6a9e96d6c6e
parent5c53f7b228baff9ec2df4f9cef807f6e5137bb56
parent22948d6daa2ed067faea374f1576c30340fd7f84
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* '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