diff options
| author | Erik Johnston <erik@matrix.org> | 2021-07-09 10:59:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-07-09 10:59:28 +0100 |
| commit | 717a07b73fec1a63a716c3ad33f3dbd2de05b06d (patch) | |
| tree | 94ed23c4d826092e7d3f74e13e8fcd6faa41fa3d | |
| parent | Ensure we always drop the federation inbound lock (#10336) (diff) | |
| download | synapse-717a07b73fec1a63a716c3ad33f3dbd2de05b06d.tar.xz | |
1.38.0rc2
| -rw-r--r-- | CHANGES.md | 16 | ||||
| -rw-r--r-- | changelog.d/10287.doc | 1 | ||||
| -rw-r--r-- | changelog.d/10331.doc | 1 | ||||
| -rw-r--r-- | changelog.d/10336.bugfix | 1 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 |
5 files changed, 17 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index c930b48b25..cd26ca3c4c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,19 @@ +Synapse 1.38.0rc2 (2021-07-09) +============================== + +Bugfixes +-------- + +- Fix bug where inbound federation in a room could be delayed due to not correctly dropping a lock. Introduced in v1.37.1. ([\#10336](https://github.com/matrix-org/synapse/issues/10336)) + + +Improved Documentation +---------------------- + +- Update links to documentation in sample config. Contributed by @dklimpel. ([\#10287](https://github.com/matrix-org/synapse/issues/10287)) +- Fix broken links in INSTALL.md. Contributed by @dklimpel. ([\#10331](https://github.com/matrix-org/synapse/issues/10331)) + + Synapse 1.38.0rc1 (2021-07-06) ============================== diff --git a/changelog.d/10287.doc b/changelog.d/10287.doc deleted file mode 100644 index d62afc1e15..0000000000 --- a/changelog.d/10287.doc +++ /dev/null @@ -1 +0,0 @@ -Update links to documentation in sample config. Contributed by @dklimpel. diff --git a/changelog.d/10331.doc b/changelog.d/10331.doc deleted file mode 100644 index 9b9acd9007..0000000000 --- a/changelog.d/10331.doc +++ /dev/null @@ -1 +0,0 @@ -Fix broken links in INSTALL.md. Contributed by @dklimpel. diff --git a/changelog.d/10336.bugfix b/changelog.d/10336.bugfix deleted file mode 100644 index 5e75ed3335..0000000000 --- a/changelog.d/10336.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix bug where inbound federation in a room could be delayed due to not correctly dropping a lock. Introduced in v1.37.1. diff --git a/synapse/__init__.py b/synapse/__init__.py index aa9a3269c0..119afa9ebe 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.38.0rc1" +__version__ = "1.38.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 |