diff options
| author | Erik Johnston <erik@matrix.org> | 2021-05-27 14:59:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-05-27 14:59:46 +0100 |
| commit | 8e132fe64e38bf2fa979beac232ea06bdd455723 (patch) | |
| tree | 3e1f488a059a670068468f44c55aa4df9aee059b /synapse | |
| parent | Fix up `BatchingQueue` (#10078) (diff) | |
| parent | 1.35.0rc2 (diff) | |
| download | synapse-8e132fe64e38bf2fa979beac232ea06bdd455723.tar.xz | |
Merge tag 'v1.35.0rc2' into develop
Synapse 1.35.0rc2 (2021-05-27) ============================== Bugfixes -------- - Fix a bug introduced in v1.35.0rc1 when calling the spaces summary API via a GET request. ([\#10079](https://github.com/matrix-org/synapse/issues/10079))
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index e60e9db71e..6faf31dbbc 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.35.0rc1" +__version__ = "1.35.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 diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 00ff02c7cb..59e0a434dc 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -1398,7 +1398,7 @@ class FederationSpaceSummaryServlet(BaseFederationServlet): ) return 200, await self.handler.federation_space_summary( - room_id, suggested_only, max_rooms_per_space, exclude_rooms + origin, room_id, suggested_only, max_rooms_per_space, exclude_rooms ) # TODO When switching to the stable endpoint, remove the POST handler. |