Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/netutils.c

1 files changed, 33 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index c0c9d11b..d48e1d8a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,28 +1,54 @@
 This file documents the major additions and syntax changes between releases.
 
-1.6 ...
+2.1
         ENHANCEMENTS
-        check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with
-          fallback to sendmail
+        New check_hpjd -p option for port specification (abrist)
+
+2.0 11th July 2014
+        ENHANCEMENTS
+        check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with
+          fallback to sendmail
         check_ide_smart now defaults to plugin output, original output appended with -v
-        Extra-Opts are now enabled by default
+        Extra-Opts are now enabled by default, see:
+          https://www.monitoring-plugins.org/doc/extra-opts.html
         check_swap now supports a configurable state when there is no swap
+        check_radius now supports the FreeRADIUS Client library
+        New check_mysql_query -f option to specify a client options file
+        New check_mysql_query -g option to specify a client options group
+        Add performance data to check_mysql_query
+        New check_file_age -i/--ignore-missing option to return OK on nonexistent files
+        Make check_ping, check_users, and check_disk work on Windows
+        New check_ssh -P option to specify the expected SSH protocol version
+        check_dns now emits the warning and critical thresholds with the performance data
 
         FIXES
         Don't let e.g. check_http's -C option reset SSL version if e.g. -S 1 -C 5 is specified
+        Don't have check_http's -N option expect an argument
         check_ide_smart could disable offline auto tests but could not re-enable them.
           For this reason all SMART command modes have been disabled.
         check_dig: fix wrong IPv6 arguments order (Stéphane Bortzmeyer)
+        check_dig: make sure not to give up too early when a timeout is specified with -t
+        check_log: don't stumble over log lines that include a "%" character
+        check_nt: add UPTIME to perfdata
+        Handle SNMPv3 noAuthNoPriv properly with check_snmp
+        Fix compilation with GnuTLS
 
         WARNINGS
-        check_procs now ignores its parent process to avoid unexpected results when invoked via certain shells
+        New default installation prefix: /usr/local instead of /usr/local/nagios
+        check_snmp now evaluates negative values properly, which means it might return CRITICAL
+          in cases where it used to return OK. If this is undesired, the warning/critical
+          threshold(s) must be fixed by specifying e.g. ~:100 instead of 100
+        check_procs now ignores its parent process to avoid unexpected results when invoked via
+          certain shells
         utils.sh no longer defines ECH
-        check_ide_smart -q/--quiet and -n/--nagios (Nagios-compatile output) are now deprecated
+        check_ide_smart -q/--quiet and -n/--nagios (Nagios-compatible output) are now deprecated
           but accepted for backward-compatibility
         check_ide_smart -0/--auto-off, -1/--auto-on and -i/--immediate: options have
           been disabled because they were broken
         State retention: the NAGIOS_PLUGIN_STATE_DIRECTORY environment variable has been
-          renamed MP_STATE_DIRECTORY. The old variable will continue to work in v1.6.x
+          renamed MP_STATE_PATH. The old variable will continue to work in v2.0.x
+        Add the UID of the invoking user to the state retention file path. This helps solving
+          permission issues when different users run the same plugin
         check_swap used to allow returning OK on a system without swap when only percent thresholds
           were used. This is no longer the case and one must now use -n/--no-swap=<state>
         The Perl and Shell plugins now use the PATH specified via ./configure's --trusted-path