diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-18 14:31:47 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-18 14:31:47 +0100 |
commit | 335e5d131c90b82d1e7aa3955079f549fc211540 (patch) | |
tree | e21eae5ca01c2ab157e44eca2f8c2efe99735f23 /synapse/storage/stream.py | |
parent | Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse (diff) | |
parent | Merge branch 'develop' into test-sqlite-memory (diff) | |
download | synapse-335e5d131c90b82d1e7aa3955079f549fc211540.tar.xz |
Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop
Conflicts: tests/handlers/test_profile.py
Diffstat (limited to 'synapse/storage/stream.py')
-rw-r--r-- | synapse/storage/stream.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index aff6dc9855..8c766b8a00 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -286,7 +286,7 @@ class StreamStore(SQLBaseStore): defer.returnValue(ret) def get_room_events_max_id(self): - return self._db_pool.runInteraction(self._get_room_events_max_id_txn) + return self.runInteraction(self._get_room_events_max_id_txn) def _get_room_events_max_id_txn(self, txn): txn.execute( |