Module: check_mk
Branch: master
Commit: cf5614ba1e24253e7846da3e235f2da94bc31795
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf5614ba1e2425…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Mar 13 13:05:18 2013 +0100
resolved merge conflict
---
ChangeLog | 3 ++-
livestatus/src/livecheck.c | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8ff68c8..f05e66e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,7 +72,8 @@
Core:
* Checks can now omit the typical "OK - " or "WARN -". This text
will be added automatically if missing.
-
+ * FIX: livecheck: fixed compilation bug
+
Checks & Agents:
* FIX: jolokia_metrics.mem - now able to handle negative/missing heap values
diff --git a/livestatus/src/livecheck.c b/livestatus/src/livecheck.c
index 400f645..de6a790 100644
--- a/livestatus/src/livecheck.c
+++ b/livestatus/src/livecheck.c
@@ -26,6 +26,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/timeb.h>
+#include <sys/resource.h>
#include <netinet/ip.h>
#include <stdlib.h>
#include <fcntl.h>