cherry-pick changelog from 1.1.17

diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index e33f679c8c059bb9798537bc741c7baca68b7a71..37b051f508a5907337c454a42a87aea00d313763 100644 (file)
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -19,7 +19,17 @@
 
 .. changelog::
     :version: 1.1.17
-    :include_notes_from: unreleased_11
+    :released: February 22, 2018
+
+    .. change::
+        :tags: bug, ext
+        :tickets: 4185
+
+        Repaired regression caused in 1.2.3 and 1.1.16 regarding association proxy
+        objects, revising the approach to :ticket:`4185` when calculating the
+        "owning class" of an association proxy to default to choosing the current
+        class if the proxy object is not directly associated with a mapped class,
+        such as a mixin.
 
 .. changelog::
     :version: 1.1.16

diff --git a/doc/build/changelog/unreleased_11/4185.rst b/doc/build/changelog/unreleased_11/4185.rst
deleted file mode 100644 (file)
index a6b6bfb..0000000
--- a/doc/build/changelog/unreleased_11/4185.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, ext
-    :tickets: 4185
-    :versions: 1.2.4
-
-    Repaired regression caused in 1.2.3 and 1.1.16 regarding association proxy
-    objects, revising the approach to :ticket:`4185` when calculating the
-    "owning class" of an association proxy to default to choosing the current
-    class if the proxy object is not directly associated with a mapped class,
-    such as a mixin.