diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-10-02 12:46:58 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-10-02 12:46:58 +0100 |
commit | f6c526ce6732a1af1228a08513f6a795b61c2b71 (patch) | |
tree | 81b09ac0e33d0ab8e8976c0515d8642fdb0cd429 | |
parent | Fix bug in remote thumbnail search (#8438) (diff) | |
download | synapse-f6c526ce6732a1af1228a08513f6a795b61c2b71.tar.xz |
1.21.0rc2
-rw-r--r-- | CHANGES.md | 13 | ||||
-rw-r--r-- | changelog.d/8438.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/8440.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/8442.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/8444.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/8447.bugfix | 1 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
7 files changed, 14 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index 29711c60ce..e5177e714d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,16 @@ +Synapse 1.21.0rc2 (2020-10-02) +============================== + +Bugfixes +-------- + +- Fix a regression in v1.21.0rc1 which broke thumbnails of remote media. ([\#8438](https://github.com/matrix-org/synapse/issues/8438)) +- Do not expose the experimental `uk.half-shot.msc2778.login.application_service` flow in the login API. ([\#8440](https://github.com/matrix-org/synapse/issues/8440)) +- Fix malformed log line in new federation "catch up" logic. ([\#8442](https://github.com/matrix-org/synapse/issues/8442)) +- Convert additional templates from inline HTML to Jinja2 templates. ([\#8444](https://github.com/matrix-org/synapse/issues/8444)) +- Fix DB query on startup for negative streams which caused long start up times. Introduced in #8374. ([\#8447](https://github.com/matrix-org/synapse/issues/8447)) + + Synapse 1.21.0rc1 (2020-10-01) ============================== diff --git a/changelog.d/8438.bugfix b/changelog.d/8438.bugfix deleted file mode 100644 index 3edc394149..0000000000 --- a/changelog.d/8438.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a regression in v1.21.0rc1 which broke thumbnails of remote media. diff --git a/changelog.d/8440.bugfix b/changelog.d/8440.bugfix deleted file mode 100644 index 84d5f541d1..0000000000 --- a/changelog.d/8440.bugfix +++ /dev/null @@ -1 +0,0 @@ -Do not expose the experimental `uk.half-shot.msc2778.login.application_service` flow in the login API. diff --git a/changelog.d/8442.bugfix b/changelog.d/8442.bugfix deleted file mode 100644 index 6f779a1de5..0000000000 --- a/changelog.d/8442.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix malformed log line in new federation "catch up" logic. diff --git a/changelog.d/8444.bugfix b/changelog.d/8444.bugfix deleted file mode 100644 index 30c4328d4b..0000000000 --- a/changelog.d/8444.bugfix +++ /dev/null @@ -1 +0,0 @@ -Convert additional templates from inline HTML to Jinja2 templates. diff --git a/changelog.d/8447.bugfix b/changelog.d/8447.bugfix deleted file mode 100644 index 88edaf322e..0000000000 --- a/changelog.d/8447.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix DB query on startup for negative streams which caused long start up times. Introduced in #8374. diff --git a/synapse/__init__.py b/synapse/__init__.py index 4706974508..500558bbdf 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.21.0rc1" +__version__ = "1.21.0rc2" 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 |