diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-09-18 16:50:39 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-09-18 16:50:39 +0100 |
| commit | a078de955f34baf8c997c0782b0a1773189fc182 (patch) | |
| tree | e0b3c435dc469c96d0634d84aefe71c358043a73 /synapse/storage/keys.py | |
| parent | Add comment (diff) | |
| parent | Merge pull request #3879 from matrix-org/matthew/fix-autojoin (diff) | |
| download | synapse-github/matthew/fix_overzealous_ll_state.tar.xz | |
Merge branch 'develop' into matthew/fix_overzealous_ll_state github/matthew/fix_overzealous_ll_state matthew/fix_overzealous_ll_state
Diffstat (limited to 'synapse/storage/keys.py')
| -rw-r--r-- | synapse/storage/keys.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py index f547977600..a1331c1a61 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py @@ -134,6 +134,7 @@ class KeyStore(SQLBaseStore): """ key_id = "%s:%s" % (verify_key.alg, verify_key.version) + # XXX fix this to not need a lock (#3819) def _txn(txn): self._simple_upsert_txn( txn, |