diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-12-02 10:54:55 +0100 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-12-02 10:54:55 +0100 |
| commit | ff542df44c26170afbe63a1da712264c91114e0c (patch) | |
| tree | 81dd62e8885f3b3aba0824efe38abc0ffef1b7cb /NP-VERSION-GEN | |
| parent | aa1844e49b33eaf057778c828afecb095b1a2226 (diff) | |
| parent | 063bc4e71d168e59437068fc386c9c3e9e25f4c6 (diff) | |
| download | monitoring-plugins-ff542df44c26170afbe63a1da712264c91114e0c.tar.gz | |
Merge branch 'maint'
* maint:
NEWS: Modify list of changes for 2.1.1 release
Prepare release
THANKS.in: Add new authors
NEWS: Updating all the fixes
check_tcp: fix help description regarding escape option
check_ntp: Nul-terminate jitter data
Revert "plugins/check_ntp.c - Verify struct from response"
check_real: fix null termination
check_ntp: fix null termination
check_apt: fix memset
Conflicts:
NEWS
Diffstat (limited to 'NP-VERSION-GEN')
| -rwxr-xr-x | NP-VERSION-GEN | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN index 1878eb9c..12efad72 100755 --- a/NP-VERSION-GEN +++ b/NP-VERSION-GEN | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | SRC_ROOT=`dirname $0` | 6 | SRC_ROOT=`dirname $0` |
| 7 | 7 | ||
| 8 | NPVF=NP-VERSION-FILE | 8 | NPVF=NP-VERSION-FILE |
| 9 | DEF_VER=2.1.git | 9 | DEF_VER=2.1.1.git |
| 10 | 10 | ||
| 11 | LF=' | 11 | LF=' |
| 12 | ' | 12 | ' |