From b4289795ea27b782de657a0abf30bcbee24876d8 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 30 Oct 2020 15:25:44 +0000
Subject: [PATCH 1/3] 1.22.1
---
CHANGES.md | 10 ++++++++++
changelog.d/8676.bugfix | 1 -
changelog.d/8678.bugfix | 1 -
debian/changelog | 6 ++++++
4 files changed, 16 insertions(+), 2 deletions(-)
delete mode 100644 changelog.d/8676.bugfix
delete mode 100644 changelog.d/8678.bugfix
diff --git a/CHANGES.md b/CHANGES.md
index 3a522f8518..58973d2a5d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.22.0 (2020-10-30)
+===========================
+
+Bugfixes
+--------
+
+- Fix a bug where an appservice may not be forwarded events for a room it was recently invited to. Broken in v1.22.0. ([\#8676](https://github.com/matrix-org/synapse/issues/8676))
+- Fix `Object of type frozendict is not JSON serializable` exceptions when using third-party event rules. ([\#8678](https://github.com/matrix-org/synapse/issues/8678))
+
+
Synapse 1.22.0 (2020-10-27)
===========================
diff --git a/changelog.d/8676.bugfix b/changelog.d/8676.bugfix
deleted file mode 100644
index df16c72761..0000000000
--- a/changelog.d/8676.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where an appservice may not be forwarded events for a room it was recently invited to. Broken in v1.22.0.
diff --git a/changelog.d/8678.bugfix b/changelog.d/8678.bugfix
deleted file mode 100644
index 0508d8f109..0000000000
--- a/changelog.d/8678.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix `Object of type frozendict is not JSON serializable` exceptions when using third-party event rules.
diff --git a/debian/changelog b/debian/changelog
index 40f02443f9..ae8948650f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.22.1) stable; urgency=medium
+
+ * New synapse release 1.22.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Fri, 30 Oct 2020 15:25:37 +0000
+
matrix-synapse-py3 (1.22.0) stable; urgency=medium
* New synapse release 1.22.0.
From aef85141931b8a6bcf4f0840e694dc5806df146a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 30 Oct 2020 15:27:58 +0000
Subject: [PATCH 2/3] use correct version
---
CHANGES.md | 2 +-
synapse/__init__.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 58973d2a5d..39af62bdfe 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Synapse 1.22.0 (2020-10-30)
+Synapse 1.22.1 (2020-10-30)
===========================
Bugfixes
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 35a82c0bfe..3e1df2b035 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
except ImportError:
pass
-__version__ = "1.22.0"
+__version__ = "1.22.1"
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
From b176f1036a247959f64378f3f3fa4b5175b3b5e9 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 30 Oct 2020 15:33:33 +0000
Subject: [PATCH 3/3] Fix changelog
---
CHANGES.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 39af62bdfe..8bd7825089 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,8 +4,8 @@ Synapse 1.22.1 (2020-10-30)
Bugfixes
--------
-- Fix a bug where an appservice may not be forwarded events for a room it was recently invited to. Broken in v1.22.0. ([\#8676](https://github.com/matrix-org/synapse/issues/8676))
-- Fix `Object of type frozendict is not JSON serializable` exceptions when using third-party event rules. ([\#8678](https://github.com/matrix-org/synapse/issues/8678))
+- Fix a bug where an appservice may not be forwarded events for a room it was recently invited to. Broke in v1.22.0. ([\#8676](https://github.com/matrix-org/synapse/issues/8676))
+- Fix `Object of type frozendict is not JSON serializable` exceptions when using third-party event rules. Broke in v1.22.0. ([\#8678](https://github.com/matrix-org/synapse/issues/8678))
Synapse 1.22.0 (2020-10-27)