From e1e5ea4667576a5a6d6d4b52ca831ca462a94173 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 29 Mar 2018 10:38:31 +0200
Subject: [PATCH] Update dnsdist 1.3.0 changelog

---
 pdns/dnsdistdist/docs/changelog.rst        | 62 ++++++++++++++++++++++
 pdns/dnsdistdist/docs/guides/dynblocks.rst |  2 +
 pdns/dnsdistdist/docs/upgrade_guide.rst    | 11 ++++
 3 files changed, 75 insertions(+)

diff --git a/pdns/dnsdistdist/docs/changelog.rst b/pdns/dnsdistdist/docs/changelog.rst
index 10bc7c64d..2d992ed08 100644
--- a/pdns/dnsdistdist/docs/changelog.rst
+++ b/pdns/dnsdistdist/docs/changelog.rst
@@ -184,6 +184,68 @@ Changelog
 
     Ensure :program:`dnsdist` compiles on NetBSD (Tom Ivar Helbekkmo).
 
+  .. change::
+    :tags: Improvements
+    :pullreq: 5845
+    :tickets: 5845
+
+    Also log eBPF dynamic blocks, as regular dynamic block already are.
+
+  .. change::
+    :tags: New Features, Improvements
+    :pullreq: 6391
+
+    Add :ref:`DynBlockRulesGroup` to improve processing speed of the :func:`maintenance` function by reducing memory usage and not walking the ringbuffers multiple times.
+
+  .. change::
+    :tags: Removals
+    :pullreq: 6394
+    :tickets: 6329
+
+    Remove the ``--daemon`` option from :program:`dnsdist`.
+
+  .. change::
+    :tags: New Features
+    :pullreq: 6399
+    :tickets: 4654
+
+    Add :func:`console ACL <addConsoleACL>` functions.
+
+  .. change::
+    :tags: New Features
+    :pullreq: 6400
+    :tickets: 6098
+
+    Allow adding :meth:`EDNS Client Subnet information <ServerPool:setECS>` to a query before looking in the cache.
+    This allows serving ECS enabled answers from the cache when all servers in a pool are down.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 6401
+    :tickets: 6211
+
+    Ensure large numbers are shown correctly in the API.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 6402
+    :tickets: 5763
+
+    Add option to :func:`showRules` to truncate the output length.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 6403
+
+    Avoid assertion errors in :func:`NewServer` (Chris Hofstaedtler).
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 6407
+
+    Fix several warnings reported by clang's analyzer and cppcheck, should lead to small performance increases.
+
+
 .. changelog::
   :version: 1.2.1
   :released: 16th of February 2018
diff --git a/pdns/dnsdistdist/docs/guides/dynblocks.rst b/pdns/dnsdistdist/docs/guides/dynblocks.rst
index b97210585..6c9e58cd9 100644
--- a/pdns/dnsdistdist/docs/guides/dynblocks.rst
+++ b/pdns/dnsdistdist/docs/guides/dynblocks.rst
@@ -23,6 +23,8 @@ For example, to send a REFUSED code instead of droppping the query::
 
   setDynBlocksAction(DNSAction.Refused)
 
+.. _DynBlockRulesGroup:
+
 DynBlockRulesGroup
 ------------------
 
diff --git a/pdns/dnsdistdist/docs/upgrade_guide.rst b/pdns/dnsdistdist/docs/upgrade_guide.rst
index bf2b96ecf..782ba2117 100644
--- a/pdns/dnsdistdist/docs/upgrade_guide.rst
+++ b/pdns/dnsdistdist/docs/upgrade_guide.rst
@@ -1,6 +1,17 @@
 Upgrade Guide
 =============
 
+1.2.x to 1.3.x
+--------------
+
+In version 1.3.0, these things have changed.
+
+The :ref:`Console` has an ACL now, which is set to ``{"127.0.0.0/8", "::1/128"}`` by default.
+Add the appropriate :func:`setConsoleACL` and :func:`addConsoleACL` statements to the configuration file.
+
+The ``--daemon`` option is removed from the :program:`dnsdist` binary, meaning that :program:`dnsdist` will not fork to the background anymore.
+Hence, it can only be run on the foreground or under a supervisor like systemd, supervisord and ``daemon(8)``.
+
 1.1.0 to 1.2.0
 --------------
 
-- 
2.40.0