From be644a7a28f2477e1a2b27001ba0a25acb73893f Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Mon, 5 Oct 2020 15:15:32 -0700
Subject: [PATCH] Authors/ChangeLog for 2.25.1

Change-Id: I222e0b77d3e0d0282cb209a40d3b23ef1c70a78a
---
 AUTHORS                                       |  1 +
 CHANGELOG                                     | 34 +++++++++++++
 .../2_25_1_release-a018fda22052deeb.yaml      | 51 +++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 releasenotes/notes/2_25_1_release-a018fda22052deeb.yaml

diff --git a/AUTHORS b/AUTHORS
index c306e7274b..6fd99fd578 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -58,6 +58,7 @@ Andy McCrae (andy.mccrae@gmail.com)
 Anh Tran (anhtt@vn.fujitsu.com)
 Ankur Gupta (ankur.gupta@intel.com)
 Anne Gentle (anne@openstack.org)
+aolivo (aolivo@blizzard.com)
 Arnaud JOST (arnaud.jost@ovh.net)
 arzhna (arzhna@gmail.com)
 Atsushi Sakai (sakaia@jp.fujitsu.com)
diff --git a/CHANGELOG b/CHANGELOG
index 53ea4d45ed..f644f85f13 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,37 @@
+swift (2.25.1, ussuri stable backports)
+
+    * Python 3 bug fixes:
+
+      * Fixed an error when reading encrypted data that was written while
+        running Python 2 for a path that includes non-ASCII characters. This
+        was caused by a difference in string types that resulted in
+        ambiguity when decrypting. To prevent the ambiguity for new data, set
+        `meta_version_to_write = 3` in your keymaster configuration after
+        upgrading all proxy servers.
+
+        If upgrading from Swift 2.20.0 or Swift 2.19.1 or earlier, set
+        `meta_version_to_write = 1` in your keymaster configuration prior
+        to upgrading.
+
+      * Object expiration respects the `expiring_objects_container_divisor`
+        config option.
+
+      * `fallocate_reserve` may be specified as a percentage in more places.
+
+      * The ETag-quoting middleware no longer raises TypeErrors.
+
+    * Improved how containers reclaim deleted rows to reduce locking and object
+      update throughput.
+
+    * Fix a proxy-server error when retrieving erasure coded data when
+      there are durable fragments but not enough to reconstruct.
+
+    * Fixed some SignatureDoesNotMatch errors when using the AWS .NET SDK.
+
+    * Region name config option is now respected when configuring S3 credential
+      caching.
+
+
 swift (2.25.0, OpenStack Ussuri)
 
     * WSGI server processes can now notify systemd when they are ready.
diff --git a/releasenotes/notes/2_25_1_release-a018fda22052deeb.yaml b/releasenotes/notes/2_25_1_release-a018fda22052deeb.yaml
new file mode 100644
index 0000000000..fe906a59ca
--- /dev/null
+++ b/releasenotes/notes/2_25_1_release-a018fda22052deeb.yaml
@@ -0,0 +1,51 @@
+---
+upgrade:
+  - |
+    **If your cluster has encryption enabled and is still running Swift
+    under Python 2**, we recommend upgrading Swift *before* transitioning to
+    Python 3. Otherwise, new writes to objects with non-ASCII characters
+    in their paths may result in corrupted downloads when read from a
+    proxy-server still running old swift on Python 2. See `bug 1888037
+    <https://bugs.launchpad.net/swift/+bug/1888037>`__ for more information.
+
+  - |
+    The above bug was caused by a difference in string types that resulted
+    in ambiguity when decrypting. To prevent the ambiguity for new data, set
+    ``meta_version_to_write = 3`` in your keymaster configuration *after*
+    upgrading all proxy servers.
+
+    If upgrading from Swift 2.20.0 or Swift 2.19.1 or earlier, set
+    ``meta_version_to_write = 1`` in your keymaster configuration *prior*
+    to upgrading.
+
+    See the provided ``keymaster.conf-sample`` for more information about
+    this setting.
+
+fixes:
+  - |
+    Python 3 bug fixes:
+
+    * Fixed an error when reading encrypted data that was written while
+      running Python 2 for a path that includes non-ASCII characters.
+
+    * Object expiration respects the ``expiring_objects_container_divisor``
+      config option.
+
+    * ``fallocate_reserve`` may be specified as a percentage in more places.
+
+    * The ETag-quoting middleware no longer raises TypeErrors.
+
+  - |
+    Improved how containers reclaim deleted rows to reduce locking and object
+    update throughput.
+
+  - |
+    Fix a proxy-server error when retrieving erasure coded data when
+    there are durable fragments but not enough to reconstruct.
+
+  - |
+    Fixed some SignatureDoesNotMatch errors when using the AWS .NET SDK.
+
+  - |
+    Region name config option is now respected when configuring S3 credential
+    caching.