Merge branch '1.2.0-rc2' into 'master'

Release second release candidate of 1.2.0 See merge request !164

Merge branch '1.2.0-rc2' into 'master'
Release second release candidate of 1.2.0 See merge request !164
76b1f347 · Ondřej Surý · ec60adbc · 921e5e9d · 76b1f347 · 76b1f347
Commit 76b1f347 authored 8 years ago by Ondřej Surý
--- a/NEWS
+++ b/NEWS
-Knot Resolver 1.2.0-rc1 (2017-01-17)
+Knot Resolver 1.2.0-rc2 (2017-01-20)
 ====================================

 Security:

--- 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