From bb90b0127d671858896dd646c536040bd465ef27 Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Fri, 16 Oct 2015 11:26:05 +0200
Subject: Prepare for the 2.1.2 release


diff --git a/NEWS b/NEWS
index 5ca3f8c..2a9ea62 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,12 @@ This file documents the major additions and syntax changes between releases.
 	The superseded check_ntp.pl was removed, please use check_ntp_peer or
 	  check_ntp_time instead
 
+2.1.2 16th October 2015
+	FIXES
+	Fix incorrect performance data thresholds emitted by check_ups
+	Fix check_dhcp's option parsing to not crash with certain arguments
+	Fix check_snmp using correct timeout
+
 2.1.1 2nd December 2014
 	FIXES
 	Fix check_ntp's jitter checking
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
index 12efad7..dd82bf1 100755
--- a/NP-VERSION-GEN
+++ b/NP-VERSION-GEN
@@ -6,7 +6,7 @@
 SRC_ROOT=`dirname $0`
 
 NPVF=NP-VERSION-FILE
-DEF_VER=2.1.1.git
+DEF_VER=2.1.2.git
 
 LF='
 '
diff --git a/configure.ac b/configure.ac
index 29de4bd..0a554af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(monitoring-plugins,2.1.1)
+AC_INIT(monitoring-plugins,2.1.2)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile])
 AC_CONFIG_AUX_DIR(build-aux)
-- 
cgit v0.10-9-g596f