diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
| commit | f9834a3d1a25d0a715718a53e10752399985e3aa (patch) | |
| tree | 3d868eafb43d9646b15cd1aaee0f4093db802fd3 /synapse/rest/client/v1/base.py | |
| parent | Merge branch 'erikj/ldap3_auth' (diff) | |
| parent | Bump changelog (diff) | |
| download | synapse-f9834a3d1a25d0a715718a53e10752399985e3aa.tar.xz | |
Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4
Diffstat (limited to 'synapse/rest/client/v1/base.py')
| -rw-r--r-- | synapse/rest/client/v1/base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/base.py b/synapse/rest/client/v1/base.py index c2a8447860..c7aa0bbf59 100644 --- a/synapse/rest/client/v1/base.py +++ b/synapse/rest/client/v1/base.py @@ -18,7 +18,8 @@ from synapse.http.servlet import RestServlet from synapse.api.urls import CLIENT_PREFIX -from .transactions import HttpTransactionStore +from synapse.rest.client.transactions import HttpTransactionCache + import re import logging @@ -59,4 +60,4 @@ class ClientV1RestServlet(RestServlet): self.hs = hs self.builder_factory = hs.get_event_builder_factory() self.auth = hs.get_v1auth() - self.txns = HttpTransactionStore() + self.txns = HttpTransactionCache(hs.get_clock()) |