summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-15 11:53:01 +0100
committerNeil Johnson <neil@matrix.org>2018-08-15 11:53:01 +0100
commitc4eb97518f3bc442c1c9c87e27db1960d3dab94c (patch)
treecb886e00e71213b4a47c3e41199e18053344df8e /synapse/api
parentupdate admin email to uri (diff)
parentupdate error codes (diff)
downloadsynapse-c4eb97518f3bc442c1c9c87e27db1960d3dab94c.tar.xz
Merge branch 'neilj/update_limits_error_codes' of github.com:matrix-org/synapse into neilj/admin_email
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/errors.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index b677087e73..10b0356e86 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -56,8 +56,7 @@ class Codes(object):
     SERVER_NOT_TRUSTED = "M_SERVER_NOT_TRUSTED"
     CONSENT_NOT_GIVEN = "M_CONSENT_NOT_GIVEN"
     CANNOT_LEAVE_SERVER_NOTICE_ROOM = "M_CANNOT_LEAVE_SERVER_NOTICE_ROOM"
-    MAU_LIMIT_EXCEEDED = "M_MAU_LIMIT_EXCEEDED"
-    HS_DISABLED = "M_HS_DISABLED"
+    RESOURCE_LIMIT_EXCEED = "M_RESOURCE_LIMIT_EXCEED"
     UNSUPPORTED_ROOM_VERSION = "M_UNSUPPORTED_ROOM_VERSION"
     INCOMPATIBLE_ROOM_VERSION = "M_INCOMPATIBLE_ROOM_VERSION"