?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e8e5b04 6bf80e9)
Merge changes I9ef0097d,Ib9f094de,I2c7797dc,Ia462fddcv2.1.2-beta3
commit196491b2033d333487aec5322640fdf7d659a63c
authorMattias Ryrlen <mattiasr@op5.com>
Wed, 25 Jun 2014 15:22:11 +0000 (25 17:22 +0200)
committerGerrit Code Review <gerrit@devel.dev.op5.com>
Wed, 25 Jun 2014 15:22:11 +0000 (25 17:22 +0200)
treecff305601b7d393f9f81a82ffec13671f57d4a3atree | snapshot (tar.gz zip)
parente8e5b04a13f1c12e5d1d1ac584e0bbc8bcdb1181commit | diff
parent6bf80e9aeb43e4bf7f5161b2f8e6fef36a5faa5ccommit | diff
Merge changes I9ef0097d,Ib9f094de,I2c7797dc,Ia462fddc

* changes:
  test: Make mon test dist possible to run as root
  test: Fix downtime races
  test: Fix spelling, messages
  oconf: Only sync files for nodes with changed config
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.