diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-27 14:41:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-27 14:41:40 +0100 |
| commit | 6f8e2d517e8141f62cb0cfcc73c3842a367ff21c (patch) | |
| tree | 4f4569d1bbf7b6fcc2a67c1664da38b75e81a5ee /synapse/api/errors.py | |
| parent | Shuffle operations so that locking upsert happens last in the txn. This ensur... (diff) | |
| parent | Merge pull request #132 from matrix-org/observer_and_locks (diff) | |
| download | synapse-6f8e2d517e8141f62cb0cfcc73c3842a367ff21c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
Diffstat (limited to 'synapse/api/errors.py')
| -rw-r--r-- | synapse/api/errors.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index eddd889778..72d2bd5b4c 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -35,8 +35,8 @@ class Codes(object): LIMIT_EXCEEDED = "M_LIMIT_EXCEEDED" CAPTCHA_NEEDED = "M_CAPTCHA_NEEDED" CAPTCHA_INVALID = "M_CAPTCHA_INVALID" - MISSING_PARAM = "M_MISSING_PARAM", - TOO_LARGE = "M_TOO_LARGE", + MISSING_PARAM = "M_MISSING_PARAM" + TOO_LARGE = "M_TOO_LARGE" EXCLUSIVE = "M_EXCLUSIVE" |