diff options
| author | Erik Johnston <erik@matrix.org> | 2020-10-30 16:27:02 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-10-30 16:27:02 +0000 |
| commit | f27a7896972d71af3ac21e82a81a64085fec32f1 (patch) | |
| tree | 3562d5ce93b4f21c927a5229165b2aabe1605698 | |
| parent | Merge branch 'release-v1.22.1' into develop (diff) | |
| parent | Fix changelog (diff) | |
| download | synapse-f27a7896972d71af3ac21e82a81a64085fec32f1.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 10 | ||||
| -rw-r--r-- | changelog.d/8676.bugfix | 1 | ||||
| -rw-r--r-- | changelog.d/8678.bugfix | 1 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md index 3a522f8518..8bd7825089 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,13 @@ +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. 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) =========================== 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. 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 |