dnsdist: Update the ChangeLog for 1.2.0

diff --git a/pdns/dnsdistdist/docs/changelog.rst b/pdns/dnsdistdist/docs/changelog.rst
index 8edc7f745c3bd9c180430c56a4f6f4bf2ba105ab..11d43255067a6fe00a777731b6b40224dbc21753 100644 (file)
--- a/pdns/dnsdistdist/docs/changelog.rst
+++ b/pdns/dnsdistdist/docs/changelog.rst
@@ -3,6 +3,7 @@ Changelog
 
 .. changelog::
   :version: 1.2.0
+  :released: 21st of August 2017
 
   .. change::
     :tags: Improvements
@@ -387,10 +388,57 @@ Changelog
 
   .. change::
     :tags: New Features
-    :pullreq: 5396
+    :pullreq: 5396, 5577
 
     Add the capability to set arbitrary tags in protobuf messages.
 
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 5563
+    :tickets: 5559
+
+    Skip timeouts on the response latency graph.
+
+  .. change::
+    :tags: Removals
+    :pullreq: 5526
+    :tickets: 5069
+
+    Deprecate syntactic sugar functions.
+
+  .. change::
+    :tags: Improvements
+    :pullreq: 5579
+    :tickets: 5538
+
+    Don't use square brackets for IPv6 in Carbon metrics.
+
+  .. change::
+    :tags: Bug Fixes
+    :pullreq: 5580
+    :tickets: 5566
+
+    Copy the DNS header before encrypting it in place.
+
+  .. change::
+    :tags: New Features
+    :pullreq: 5581
+    :tickets: 5565
+
+    Add setConsoleConnectionsLogging().
+
+  .. change::
+    :tags: Security
+    :pullreq: 5630
+
+    Fix potential pointer wrap-around on 32 bits.
+
+  .. change::
+    :tags: Security
+    :pullreq: 5631
+
+    Make the API available with an API key only.
+
 1.1.0
 -----
 

diff --git a/pdns/dnsdistdist/docs/conf.py b/pdns/dnsdistdist/docs/conf.py
index 8df5fbe0743736732ee3afcf9c2176bf1635c5ba..39cfbf9e7b8cff75f1b1981d95903e70407009e0 100644 (file)
--- a/pdns/dnsdistdist/docs/conf.py
+++ b/pdns/dnsdistdist/docs/conf.py
@@ -58,7 +58,7 @@ author = 'PowerDNS.COM BV and its contributors'
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0-alpha1'
+release = '1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.