From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 10 Feb 2017 07:52:31 +0000 (+0100)
Subject: Prepare 1.2.2 release
X-Git-Tag: v1.2.2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b708c51e08815ceef6d0b5fe38cc74f080f3ded2;p=thirdparty%2Fknot-resolver.git

Prepare 1.2.2 release
---

diff --git a/NEWS b/NEWS
index 2829fa142..e5ce411e1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Knot Resolver 1.2.2 (2017-02-10)
+================================
+
+Bugfixes:
+---------
+- Fix -k argument processing to avoid out-of-bounds memory accesses
+- lib/resolve: fix zonecut fetching for explicit DS queries
+- hints: more NULL checks
+- Fix TA bootstrapping for multiple TAs in the IANA XML file
+
 Knot Resolver 1.2.1 (2017-02-01)
 ====================================
 
diff --git a/config.mk b/config.mk
index 0677e8abe..b950ea336 100644
--- a/config.mk
+++ b/config.mk
@@ -1,7 +1,7 @@
 # Project
 MAJOR := 1
 MINOR := 2
-PATCH := 1
+PATCH := 2
 EXTRA :=
 ABIVER := 2
 BUILDMODE := dynamic