Module: check_mk
Branch: master
Commit: 5fc194672aeb3ce4a05637cd6d73d0812c8e8f37
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fc194672aeb3c…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Wed Jan 21 16:42:21 2015 +0100
noop on Changelog
---
ChangeLog | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3426c01..5b31962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,13 +48,10 @@
NOTE: Please refer to the migration notes!
* 1525 viprinet_temp: Now uses new Temperature WATO rule...
NOTE: Please refer to the migration notes!
-<<<<<<< HEAD
- * 1526 climaveneta_fan: No longer outputs performance data, now configured via
"fan" rule...
- NOTE: Please refer to the migration notes!
-=======
* 1673 netapp_volumes: now able to configure levels by magic factor
* 1854 netscaler_tcp_conns: new check to monitor tcp connections on Citrix Netscaler
Loadbalancer Appliances
->>>>>>> 92eaa76066f0ba1122cb72f4f1f783d8c0439378
+ * 1526 climaveneta_fan: No longer outputs performance data, now configured via
"fan" rule...
+ NOTE: Please refer to the migration notes!
* 1457 FIX: logins: new check renamed from "users" check...
NOTE: Please refer to the migration notes!
* 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...
@@ -166,7 +163,7 @@
HW/SW-Inventory:
* 1846 Keep track of changes of software and hardware...
- * 1855 esx_systeminfo: new inventory check to retrieve info about the host operating
system for ESX servers
+ * 1855 esx_systeminfo: new inventory plugin to retrieve info about the host operating
system for ESX servers
* 1851 FIX: win_exefiles: inventory check can now handle time stamps in us english
locale