| commit | ff542df44c26170afbe63a1da712264c91114e0c | |
| author | Holger Weiss <holger@zedat.fu-berlin.de> | |
| Tue, 2 Dec 2014 09:54:55 +0000 (2 10:54 +0100) | ||
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | |
| Tue, 2 Dec 2014 09:54:55 +0000 (2 10:54 +0100) | ||
| tree | 81dd62e8885f3b3aba0824efe38abc0ffef1b7cb | treesnapshot (tar.gz zip) |
| parent | aa1844e49b33eaf057778c828afecb095b1a2226 | commitdiff |
| parent | 063bc4e71d168e59437068fc386c9c3e9e25f4c6 | commitdiff |
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
* 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
| NEWS | diff1 | diff2 | blobhistory |
| configure.ac | diff1 | diff2 | blobhistory |
| plugins/check_real.c | diff1 | diff2 | blobhistory |