?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: efd6bd4 3bc27fa)
Merge changes Ibc3124e6,I253234ac into maint/7.0v2.1.2-beta6
commitf85691e3435b8eefa4dfd5ae481e971a75ae0106
authorMikael Falkvidd <mfalkvidd@op5.com>
Wed, 9 Jul 2014 13:00:40 +0000 (9 15:00 +0200)
committerGerrit Code Review <gerrit@devel.dev.op5.com>
Wed, 9 Jul 2014 13:00:40 +0000 (9 15:00 +0200)
treeb6f67c52723ced06cea63e54f027bd151d322ff1tree | snapshot (tar.gz zip)
parentefd6bd4fd809c18a1900c89de5becad3d073eff4commit | diff
parent3bc27fa86608cf183e208a154a0ebea31eaa63fdcommit | diff
Merge changes Ibc3124e6,I253234ac into maint/7.0

* changes:
  mon syscheck ... => mon sysconf check ...
  mon syscheck: Fix SLES lockfiles
nagios-merlin is an eventbroker module / daemon pair which acts as an event transport layer. Transporting events between multiple Nagios instances allows building loadbalanced, redundant and distributed monitoring solutions quite easily.