diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-03-03 11:39:25 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-03-03 11:39:25 +0000 |
| commit | 79f34bdbc2720a832cdab36ba58e83201e549c41 (patch) | |
| tree | 2bdadb2bd2d2dac1a6722c4d33ca81febb7d7ece /synapse/storage/state.py | |
| parent | Fix typo (diff) | |
| parent | jenkins.sh: set -x (diff) | |
| download | synapse-79f34bdbc2720a832cdab36ba58e83201e549c41.tar.xz | |
Merge branch 'develop' into rav/SYN-642
Diffstat (limited to 'synapse/storage/state.py')
| -rw-r--r-- | synapse/storage/state.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py index 372b540002..8ed8a21b0a 100644 --- a/synapse/storage/state.py +++ b/synapse/storage/state.py @@ -83,7 +83,7 @@ class StateStore(SQLBaseStore): if event.is_state(): state_events[(event.type, event.state_key)] = event - state_group = self._state_groups_id_gen.get_next_txn(txn) + state_group = self._state_groups_id_gen.get_next() self._simple_insert_txn( txn, table="state_groups", |