diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-03 09:54:08 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-03 09:54:08 +0100 |
| commit | efeeff29f66f14fd4744413a3fd211d01e6c302a (patch) | |
| tree | db5be4d096fdd045623017abffc7b67806c55c32 /synapse/storage/transactions.py | |
| parent | hacky support for video for FS CC DD (diff) | |
| parent | Change log level to info (diff) | |
| download | synapse-efeeff29f66f14fd4744413a3fd211d01e6c302a.tar.xz | |
Merge branch 'release-v0.10.0' v0.10.0
Diffstat (limited to 'synapse/storage/transactions.py')
| -rw-r--r-- | synapse/storage/transactions.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py index 624da4a9dc..c8c7e6591a 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ._base import SQLBaseStore, cached +from ._base import SQLBaseStore +from synapse.util.caches.descriptors import cached from collections import namedtuple |