- 1.1.17

diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index 0d7fc597a99dbdff893fc25271dc21176e971cc8..2e1323cfbe7bc33aa8dcc77810f1179c8e2c3f1e 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 e4dfbd2..0000000
--- a/doc/build/changelog/unreleased_11/4185.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. 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.

diff --git a/doc/build/conf.py b/doc/build/conf.py
index 98775b682bfe3a5286a9638443f4485c9cd71452..762be4583f05076c63cf397b6c400028b6894add 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -110,9 +110,9 @@ copyright = u'2007-2018, the SQLAlchemy authors and contributors'
 # The short X.Y version.
 version = "1.1"
 # The full version, including alpha/beta/rc tags.
-release = "1.1.16"
+release = "1.1.17"
 
-release_date = "February 16, 2018"
+release_date = "February 22, 2018"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"