From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 24 Jun 2022 16:20:36 +0000 (-0400)
Subject: cherry-pick changelog from 1.4.39
X-Git-Tag: rel_2_0_0b1~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0667f0fb051ffa2d57ef44b2cb0093d01672bafe;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cherry-pick changelog from 1.4.39
---

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index 24657c11ff..49f99d17d7 100644
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -15,7 +15,17 @@ This document details individual issue-level changes made throughout
 
 .. changelog::
     :version: 1.4.39
-    :include_notes_from: unreleased_14
+    :released: June 24, 2022
+
+    .. change::
+        :tags: bug, orm, regression
+        :tickets: 8133
+
+        Fixed regression caused by :ticket:`8133` where the pickle format for
+        mutable attributes was changed, without a fallback to recognize the old
+        format, causing in-place upgrades of SQLAlchemy to no longer be able to
+        read pickled data from previous versions. A check plus a fallback for the
+        old format is now in place.
 
 .. changelog::
     :version: 1.4.38
diff --git a/doc/build/changelog/unreleased_14/mutable_fix.rst b/doc/build/changelog/unreleased_14/mutable_fix.rst
deleted file mode 100644
index 2c96878b86..0000000000
--- a/doc/build/changelog/unreleased_14/mutable_fix.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, orm, regression
-    :tickets: 8133
-
-    Fixed regression caused by :ticket:`8133` where the pickle format for
-    mutable attributes was changed, without a fallback to recognize the old
-    format, causing in-place upgrades of SQLAlchemy to no longer be able to
-    read pickled data from previous versions. A check plus a fallback for the
-    old format is now in place.