[checkmk-commits] fixed Changelog

Module: check_mk Branch: master Commit: ff4bd226137c31cefeacfb703bb40028a4741017 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff4bd226137c31… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Thu Nov 10 12:17:34 2016 +0100 fixed Changelog --- ChangeLog | 3 --- 1 file changed, 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c773da9..238612c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,12 +54,9 @@ * 3949 ucd_cpu_load: Genugate devices are now displaying CPU load... * 3950 openbsd_sensors: Genugate devices are now handling hardware sensors... * 3749 storcli_pdisks, storcli_vdrives: New checks to monitor RAID status via StorCLI utility -<<<<<<< 0af2546d520a3da01e639439dcc9db59b790cdf7 -======= * 3988 Windows agent: new global option disabled_sections... * 3989 Logwatch patterns: now able to change state of context lines... * 3990 now uses xml instead of lxml. now able to query counters smaller chunks. now only queries relevant sections... ->>>>>>> 3990 now uses xml instead of lxml. now able to query counters smaller chunks. now only queries relevant sections * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe...