From dd7ba9e77d81824f1ee5d12fe854386fd1b6edbe Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Tue, 28 Feb 2017 12:03:19 +0100
Subject: [PATCH] Update to 1.2.4-dev

---
 NEWS      | 21 +++++++++++++++++++++
 config.mk |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 85808a3e2..436e91ac0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Knot Resolver 1.2.4-dev (2017-03-XX)
+================================
+
+Improvements
+------------
+- modules/policy: allow QTRACE policy to be chained with other policies
+- hints.add_hosts(path): a new property
+- module: document the API and simplify the code
+- policy.MIRROR: support IPv6 link-local addresses
+- policy.FORWARD: support IPv6 link-local addresses
+
+Bugfixes
+--------
+- layer/iterate: some improvements in cname chain unrolling
+- layer/validate: fix duplicate records in AUTHORITY section in case of WC expansion proof
+- lua: do *not* truncate cache size to unsigned
+
+
 Knot Resolver 1.2.3 (2017-02-23)
 ================================
 
@@ -9,6 +27,7 @@ Bugfixes
 - layer/iterate: some additional processing for referrals
 - lib/resolve: zonecut fetching error was fixed
 
+
 Knot Resolver 1.2.2 (2017-02-10)
 ================================
 
@@ -23,6 +42,7 @@ Testing:
 --------
 - Update tests to run tests with and without QNAME minimization
 
+
 Knot Resolver 1.2.1 (2017-02-01)
 ====================================
 
@@ -41,6 +61,7 @@ Bugfixes:
 ---------
 - lua: make the map command check its arguments
 
+
 Knot Resolver 1.2.0 (2017-01-24)
 ====================================
 
diff --git a/config.mk b/config.mk
index 2bfd92d5a..f934a7441 100644
--- a/config.mk
+++ b/config.mk
@@ -1,8 +1,8 @@
 # Project
 MAJOR := 1
 MINOR := 2
-PATCH := 3
-EXTRA :=
+PATCH := 4
+EXTRA := -dev
 ABIVER := 2
 BUILDMODE := dynamic
 HARDENING := yes
-- 
2.47.3