Module: check_mk
Branch: master
Commit: d753a4ee8b978019bc41cc9caf432f91dea4750f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d753a4ee8b9780…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Jan 27 14:54:10 2015 +0100
fixed Changelog
---
ChangeLog | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 550b6b1..4f16366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,11 +56,8 @@
* 1918 ps: new option for checking the age of a process (on Linux)...
* 1920 df: Linux filesystem check now supports displaying data reserved for root...
* 1675 esx_vsphere_hostsystem.cpu_util_cluster: Averaged CPU utilization of all
cluster nodes...
-<<<<<<< HEAD
- * 1676 if.include: now able to detect grouped interfaces...
-=======
* 1216 hp_procurve_cpu: Can now be configured with Wato
->>>>>>> f5fb499eeb6b0891ec864d947d46b96789422c47
+ * 1676 if.include: now able to detect grouped interfaces...
* 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...