diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-03 09:46:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-03 09:46:40 +0100 |
| commit | 8346e6e696e6f0052bc0f68ee825c2b08da2387d (patch) | |
| tree | 11969ca353dc86c798e3fa6fc094d6b4530ffc25 /synapse/util | |
| parent | Prefill state caches (diff) | |
| parent | Merge pull request #2178 from matrix-org/erikj/message_metrics (diff) | |
| download | synapse-8346e6e696e6f0052bc0f68ee825c2b08da2387d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 98a5a26ac5..2a2360ab5d 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -26,7 +26,7 @@ logger = logging.getLogger(__name__) class DeferredTimedOutError(SynapseError): def __init__(self): - super(SynapseError, self).__init__(504, "Timed out") + super(DeferredTimedOutError, self).__init__(504, "Timed out") def unwrapFirstError(failure): |