diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-27 15:33:29 -0500 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-27 15:33:29 -0500 |
| commit | a2a3f758247c41037d161668c61d8d7a526ecfc1 (patch) | |
| tree | dcf387073cfbc7672cb7fbd27682925fa1ba3d73 /synapse/api | |
| parent | apply suggestions from review (diff) | |
| parent | Add more tests to the worker blacklist (#6429) (diff) | |
| download | synapse-a2a3f758247c41037d161668c61d8d7a526ecfc1.tar.xz | |
Merge branch 'develop' into uhoreg/e2e_backup_hash
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 2 | ||||
| -rw-r--r-- | synapse/api/errors.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 49c4b85054..e3f086f1c3 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -94,6 +94,8 @@ class EventTypes(object): ServerACL = "m.room.server_acl" Pinned = "m.room.pinned_events" + Retention = "m.room.retention" + class RejectedReason(object): AUTH_ERROR = "auth_error" diff --git a/synapse/api/errors.py b/synapse/api/errors.py index cca92c34ba..5853a54c95 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -457,7 +457,7 @@ def cs_error(msg, code=Codes.UNKNOWN, **kwargs): class FederationError(RuntimeError): - """ This class is used to inform remote home servers about erroneous + """ This class is used to inform remote homeservers about erroneous PDUs they sent us. FATAL: The remote server could not interpret the source event. |