Module: check_mk
Branch: master
Commit: c411a6381b720984b0256ac45ec91bb916a0ed54
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c411a6381b7209…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jun 3 15:49:44 2014 +0200
Fixed werk version
---
.werks/812 | 2 +-
ChangeLog | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.werks/812 b/.werks/812
index f5c4e1b..a326220 100644
--- a/.werks/812
+++ b/.werks/812
@@ -1,7 +1,7 @@
Title: nginx_status: New check for monitoring status information of the Nginx web server
Level: 2
Component: checks
-Version: 1.2.5i3
+Version: 1.2.5i4
Date: 1401803233
Class: feature
diff --git a/ChangeLog b/ChangeLog
index 8158c18..abfe129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
1.2.5i4:
+ Checks & Agents:
+ * 0812 nginx_status: New check for monitoring status information of the Nginx web
server...
+
Multisite:
* 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as
WARN...
@@ -73,11 +76,8 @@
* 0165 ups checks now supports also GE devices (Thanks to Andy Taylor)...
* 0928 runas: new plugin script to include and execute mrpe, local and plugin scripts
as different user...
* 0929 windows agent: now able to include and execute additional local and plugin
scripts as different user...
-<<<<<<< HEAD
* 0812 nginx_status: New check for monitoring status information of the Nginx web
server...
-=======
* 0961 fast_lta_volumes: new check of capacity of volumes in FAST LTA Storage
Systems...
->>>>>>> ad3197103fd23d053fa8941a5c23ecfbc34b1c8b
* 0777 FIX: special agent emcvnx: did not work with security file authentication...
* 0786 FIX: zfsget: fixed compatibility with older Solaris agents...
* 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed
detection