diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-10-02 12:59:17 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-10-02 12:59:17 +0100 |
| commit | 462e681c792e2fce6769ef80d11045da11fb0842 (patch) | |
| tree | 72c2acacc8ec9e3c1220e5d4151daae2436482eb /synapse/federation | |
| parent | Include a public_baseurl in configs generated by the demo script. (#8443) (diff) | |
| parent | move #8444 to 'feature' (diff) | |
| download | synapse-462e681c792e2fce6769ef80d11045da11fb0842.tar.xz | |
Merge tag 'v1.21.0rc2' into develop
Synapse 1.21.0rc2 (2020-10-02) ============================== Features -------- - Convert additional templates from inline HTML to Jinja2 templates. ([\#8444](https://github.com/matrix-org/synapse/issues/8444)) 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, which caused a compatibility problem with Element iOS. ([\#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)) - Fix DB query on startup for negative streams which caused long start up times. Introduced in [\#8374](https://github.com/matrix-org/synapse/issues/8374). ([\#8447](https://github.com/matrix-org/synapse/issues/8447))
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/sender/per_destination_queue.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py index 2657767fd1..bc99af3fdd 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py @@ -490,7 +490,7 @@ class PerDestinationQueue: ) if logger.isEnabledFor(logging.INFO): - rooms = (p.room_id for p in catchup_pdus) + rooms = [p.room_id for p in catchup_pdus] logger.info("Catching up rooms to %s: %r", self._destination, rooms) success = await self._transaction_manager.send_new_transaction( |