diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-02-01 18:05:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-01 18:05:47 -0700 |
| commit | 6e87b34f7b7c595d4e5b96e4a0281b8327e5b8b7 (patch) | |
| tree | 35701fcc0456593d736a3405f72a5dfd624b1cad /synapse/federation/transport/client.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #2837 from matrix-org/rav/fix_quarantine_media (diff) | |
| download | synapse-6e87b34f7b7c595d4e5b96e4a0281b8327e5b8b7.tar.xz | |
Merge branch 'develop' into travis/admin-list-media
Diffstat (limited to 'synapse/federation/transport/client.py')
| -rw-r--r-- | synapse/federation/transport/client.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 1f3ce238f6..5488e82985 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -212,6 +212,9 @@ class TransportLayerClient(object): Fails with ``NotRetryingDestination`` if we are not yet ready to retry this server. + + Fails with ``FederationDeniedError`` if the remote destination + is not in our federation whitelist """ valid_memberships = {Membership.JOIN, Membership.LEAVE} if membership not in valid_memberships: |