summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2017-01-20 16:21:23 +0100
committerOndřej Surý <ondrej@sury.org>2017-01-20 16:21:23 +0100
commit921e5e9d0c2d2d70f1a92ce01d84b7df6df36428 (patch)
tree8660a7a021de0a9a64fa8459e38f813e4524f888
parentMerge branch 'fix-cname-loop' into 'master' (diff)
downloadknot-resolver-921e5e9d0c2d2d70f1a92ce01d84b7df6df36428.tar.xz
knot-resolver-921e5e9d0c2d2d70f1a92ce01d84b7df6df36428.zip
Release second release candidate of 1.2.0
-rw-r--r--NEWS2
-rw-r--r--config.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 4441b937..c7863c7d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Knot Resolver 1.2.0-rc1 (2017-01-17)
+Knot Resolver 1.2.0-rc2 (2017-01-20)
====================================
Security:
diff --git a/config.mk b/config.mk
index 05923427..2925ba23 100644
--- a/config.mk
+++ b/config.mk
@@ -2,7 +2,7 @@
MAJOR := 1
MINOR := 2
PATCH := 0
-EXTRA := -rc1
+EXTRA := -rc2
ABIVER := 2
BUILDMODE := dynamic
HARDENING := yes