summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-11-02 13:23:01 +0000
committerErik Johnston <erik@matrix.org>2021-11-02 13:23:01 +0000
commitdf84ad602b21a4cea3a63c9117b5cd7884f1ab05 (patch)
tree23ceb6d2a08dc77cbb3e7c9139437aa53bcea6c2
parentForce deb compression with `xz`. (#11197) (diff)
downloadsynapse-df84ad602b21a4cea3a63c9117b5cd7884f1ab05.tar.xz
1.46.0
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/11196.bugfix1
-rw-r--r--debian/changelog8
-rw-r--r--synapse/__init__.py2
4 files changed, 16 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index f61d5c706f..124bdf320a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.46.0 (2021-11-02)
+===========================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.46.0rc1 where URL previews of some XML documents would fail. ([\#11196](https://github.com/matrix-org/synapse/issues/11196))
+
+
 Synapse 1.46.0rc1 (2021-10-27)
 ==============================
 
diff --git a/changelog.d/11196.bugfix b/changelog.d/11196.bugfix
deleted file mode 100644
index 3861eeb908..0000000000
--- a/changelog.d/11196.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.46.0rc1 where URL previews of some XML documents would fail.
diff --git a/debian/changelog b/debian/changelog
index c2ea5d2cfb..06e7a0862d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-matrix-synapse-py3 (1.46.0~rc1ubuntu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.46.0) stable; urgency=medium
 
+  [ Richard van der Hoff ]
   * Compress debs with xz, to fix incompatibility of impish debs with reprepro.
 
- -- Richard van der Hoff <richard@matrix.org>  Wed, 27 Oct 2021 15:32:51 +0100
+  [ Synapse Packaging team ]
+  * New synapse release 1.46.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 02 Nov 2021 13:22:53 +0000
 
 matrix-synapse-py3 (1.46.0~rc1) stable; urgency=medium
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 355b36fc63..5ef34bce40 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.46.0rc1"
+__version__ = "1.46.0"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when