From: Peter Palfrader Date: Sat, 24 Oct 2009 14:09:09 +0000 (+0200) Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d808ff0f9f8d4cee0ff492258c2edcb2528f146a;hp=0682552fd0fbc95968b65f40ac9b96619120e0a7;p=mirror%2Fdsa-nagios.git Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios * 'master' of ssh://db.debian.org/git/dsa-nagios: penalosa seems to be smp --- diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg index 1a74475..cd5663c 100644 --- a/config/nagios-master.cfg +++ b/config/nagios-master.cfg @@ -492,7 +492,7 @@ servers: luchesi: address: 137.82.84.78 parents: gw-ubc - hostgroups: computers, bl460, acpid-hosts, lenny + hostgroups: computers, bl460, acpid-hosts, lenny, ulogd-hosts wolkenstein: address: 137.82.84.89 parents: dijkstra