summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Krizek <tomas.krizek@nic.cz>2018-02-23 12:35:27 +0100
committerTomas Krizek <tomas.krizek@nic.cz>2018-02-23 12:35:27 +0100
commite0fe4b4a38fb370a4f0736689b6cc67d5a6e1c2f (patch)
tree096d2cca8f2ddb2de88fadd8ae1e40515cbc5b49
parentMerge branch 'make-detect-gcc' into 'master' (diff)
parentrelease 2.1.1 (diff)
downloadknot-resolver-e0fe4b4a38fb370a4f0736689b6cc67d5a6e1c2f.tar.xz
knot-resolver-e0fe4b4a38fb370a4f0736689b6cc67d5a6e1c2f.zip
Merge branch 'release-2-1-1' into 'master'v2.1.1
release 2.1.1 See merge request knot/knot-resolver!509
-rw-r--r--NEWS3
-rw-r--r--config.mk2
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 011293af..1799b4c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
-Knot Resolver 2.x.y (2018-02-zz)
+Knot Resolver 2.1.1 (2018-02-23)
================================
Bugfixes
--------
- when iterating, avoid unnecessary queries for NS in insecure parent.
This problem worsened in 2.0.0. (#246)
+- prevent UDP packet leaks when using TLS forwarding
- fix the hints module also on some other systems, e.g. Gentoo.
diff --git a/config.mk b/config.mk
index 13d04bd7..38c6210c 100644
--- a/config.mk
+++ b/config.mk
@@ -1,7 +1,7 @@
# Project
MAJOR := 2
MINOR := 1
-PATCH := 0
+PATCH := 1
EXTRA :=
ABIVER := 6
BUILDMODE := dynamic