cherry-pick changelog from 1.1.18

diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index 608b802a8f640301ffc76b5e6fe9f28eb7a53d44..3a005e2bbbaac6b1ea8151b2f9d9cfa7bb6c910a 100644 (file)
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -19,7 +19,27 @@
 
 .. changelog::
     :version: 1.1.18
-    :include_notes_from: unreleased_11
+    :released: March 6, 2018
+
+    .. change::
+        :tags: bug, mysql
+        :tickets: 4205
+        :versions: 1.2.5, 1.3.0b1
+
+        MySQL dialects now query the server version using ``SELECT @@version``
+        explicitly to the server to ensure we are getting the correct version
+        information back.   Proxy servers like MaxScale interfere with the value
+        that is passed to the DBAPI's connection.server_version value so this
+        is no longer reliable.
+
+    .. change::
+        :tags: bug, postgresql, py3k
+        :tickets: 4208
+        :versions: 1.2.5, 1.3.0b1
+
+        Fixed bug in Postgresql COLLATE / ARRAY adjustment first introduced
+        in :ticket:`4006` where new behaviors in Python 3.7 regular expressions
+        caused the fix to fail.
 
 .. changelog::
     :version: 1.1.17

diff --git a/doc/build/changelog/unreleased_11/4205.rst b/doc/build/changelog/unreleased_11/4205.rst
deleted file mode 100644 (file)
index 91b276b..0000000
--- a/doc/build/changelog/unreleased_11/4205.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, mysql
-    :tickets: 4205
-    :versions: 1.2.5, 1.3.0b1
-
-    MySQL dialects now query the server version using ``SELECT @@version``
-    explicitly to the server to ensure we are getting the correct version
-    information back.   Proxy servers like MaxScale interfere with the value
-    that is passed to the DBAPI's connection.server_version value so this
-    is no longer reliable.

diff --git a/doc/build/changelog/unreleased_11/4208.rst b/doc/build/changelog/unreleased_11/4208.rst
deleted file mode 100644 (file)
index e746564..0000000
--- a/doc/build/changelog/unreleased_11/4208.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, postgresql, py3k
-    :tickets: 4208
-    :versions: 1.3.0b1, 1.2.5
-
-    Fixed bug in Postgresql COLLATE / ARRAY adjustment first introduced
-    in :ticket:`4006` where new behaviors in Python 3.7 regular expressions
-    caused the fix to fail.