From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 27 Apr 2009 23:27:06 +0000 (+0200)
Subject: Resolve conflict
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=c8f718d7eb122ecd49125aa0fc609740588856f5;p=mirror%2Fdsa-nagios.git

Resolve conflict
---

c8f718d7eb122ecd49125aa0fc609740588856f5
diff --cc config/nagios-master.cfg
index 03a9769,4641cb5..4fcb4e9
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -522,7 -522,8 +522,7 @@@ servers
    escher:
      address: 213.188.99.215
      parents: gw-cst
-     hostgroups: computers, single-cpu, hasbootfs, hasvarfs
 -    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet
 -
++    hostgroups: computers, single-cpu, hasbootfs, lenny, puppet, hasvarfs
    goedel:
      address: 213.188.99.214
      parents: gw-cst