summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-11-21 10:56:40 -0600
committerEric Eastwood <erice@element.io>2022-11-21 10:56:40 -0600
commit7acb3658893a8c627ab9c19d0c00bbec20771914 (patch)
tree59aa296911be604aed30841dc3643574fb4fa5d1 /synapse/federation
parentMerge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff)
parentFaster joins: filter out non local events when a room doesn't have its full s... (diff)
downloadsynapse-github/madlittlemods/11850-migrate-to-opentelemetry.tar.xz
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry github/madlittlemods/11850-migrate-to-opentelemetry madlittlemods/11850-migrate-to-opentelemetry
Conflicts:
	poetry.lock
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/sender/per_destination_queue.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py

index baeea3f1cd..6575c6c8a5 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py
@@ -505,6 +505,7 @@ class PerDestinationQueue: new_pdus = await filter_events_for_server( self._storage_controllers, self._destination, + self._server_name, new_pdus, redact=False, )