From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 29 May 2021 20:14:52 +0000 (-0400)
Subject: - 1.4.17
X-Git-Tag: rel_1_4_17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b79c375b642684775d501fb7dc0efb2b5f4f3415;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 1.4.17
---

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index 15db5c99af..8713a14ff6 100644
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -15,7 +15,16 @@ This document details individual issue-level changes made throughout
 
 .. changelog::
     :version: 1.4.17
-    :include_notes_from: unreleased_14
+    :released: May 29, 2021
+
+    .. change::
+        :tags: bug, orm, regression
+        :tickets: 6558
+
+        Fixed regression caused by just-released performance fix mentioned in #6550
+        where a query.join() to a relationship could produce an AttributeError if
+        the query were made against non-ORM structures only, a fairly unusual
+        calling pattern.
 
 .. changelog::
     :version: 1.4.16
diff --git a/doc/build/changelog/unreleased_14/6558.rst b/doc/build/changelog/unreleased_14/6558.rst
deleted file mode 100644
index 030c409724..0000000000
--- a/doc/build/changelog/unreleased_14/6558.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, orm, regression
-    :tickets: 6558
-
-    Fixed regression caused by just-released performance fix mentioned in #6550
-    where a query.join() to a relationship could produce an AttributeError if
-    the query were made against non-ORM structures only, a fairly unusual
-    calling pattern.
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 94a63da3fc..d305ca0d98 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -195,9 +195,9 @@ copyright = u"2007-2021, the SQLAlchemy authors and contributors"  # noqa
 # The short X.Y version.
 version = "1.4"
 # The full version, including alpha/beta/rc tags.
-release = "1.4.16"
+release = "1.4.17"
 
-release_date = "May 28, 2021"
+release_date = "May 29, 2021"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"