diff options
author | Erik Johnston <erik@matrix.org> | 2016-04-07 11:11:17 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-04-07 11:11:17 +0100 |
commit | a28d0667329a65b6c187a85befd4f95f89a550b0 (patch) | |
tree | e8b44087781b8707c458f9b886effd09f5ad9990 /synapse/storage/pusher.py | |
parent | Tests (diff) | |
parent | Merge pull request #703 from matrix-org/erikj/member (diff) | |
download | synapse-a28d0667329a65b6c187a85befd4f95f89a550b0.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache
Diffstat (limited to 'synapse/storage/pusher.py')
-rw-r--r-- | synapse/storage/pusher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/pusher.py b/synapse/storage/pusher.py index 87b2ac5773..d1669c778a 100644 --- a/synapse/storage/pusher.py +++ b/synapse/storage/pusher.py @@ -78,7 +78,7 @@ class PusherStore(SQLBaseStore): defer.returnValue(rows) def get_pushers_stream_token(self): - return self._pushers_id_gen.get_max_token() + return self._pushers_id_gen.get_current_token() def get_all_updated_pushers(self, last_id, current_id, limit): def get_all_updated_pushers_txn(txn): |