Merge branch 'release-1.2.6' into 'master' v1.2.6

NEWS: prepare for 1.2.6

See merge request !280

2 files changed, 23 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index afacb4dc..8256d255 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Knot Resolver 1.2.6 (2017-04-24)
+================================
+
+Security
+--------
+- dnssec: don't set AD flag for NODATA answers if wildcard non-existence
+  is not guaranteed due to opt-out in NSEC3
+
+Improvements
+------------
+- layer/iterate: don't retry repeatedly if REFUSED
+
+Bugfixes
+--------
+- lib/nsrep: revert some changes to NS reputation tracking that caused
+  severe problems to some users of 1.2.5 (#178 and #179)
+- dnssec: fix verification of wildcarded non-singleton RRsets
+- dnssec: allow wildcards located directly under the root
+- layer/rrcache: avoid putting answer records into queries in some cases
+
+
 Knot Resolver 1.2.5 (2017-04-05)
 ================================
 
@@ -34,6 +55,7 @@ Bugfixes
   don't analyze AUTHORITY section in authoritative answer if ANSWER
   section contains records that have been requested
 
+
 Knot Resolver 1.2.4 (2017-03-09)
 ================================
 
diff --git a/config.mk b/config.mk
index ee96d338..9418a07f 100644
--- a/config.mk
+++ b/config.mk
@@ -1,7 +1,7 @@
 # Project
 MAJOR := 1
 MINOR := 2
-PATCH := 5
+PATCH := 6
 EXTRA :=
 ABIVER := 3
 BUILDMODE := dynamic