summary refs log tree commit diff
path: root/synapse/storage/schema/delta/33
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-16 00:13:51 +0000
committerErik Johnston <erik@matrix.org>2018-03-16 00:13:51 +0000
commitf609acc109af5b981c5662932392b60fa44ec5f0 (patch)
tree12041428a201b66a7c71569b8a8f1a855b9db032 /synapse/storage/schema/delta/33
parentMerge pull request #2798 from jeremycline/fedora-repo (diff)
parentNewline (diff)
downloadsynapse-0.26.1.tar.xz
Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1
Diffstat (limited to 'synapse/storage/schema/delta/33')
-rw-r--r--synapse/storage/schema/delta/33/event_fields.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/schema/delta/33/event_fields.py b/synapse/storage/schema/delta/33/event_fields.py

index 83066cccc9..1e002f9db2 100644 --- a/synapse/storage/schema/delta/33/event_fields.py +++ b/synapse/storage/schema/delta/33/event_fields.py
@@ -15,7 +15,7 @@ from synapse.storage.prepare_database import get_statements import logging -import ujson +import simplejson logger = logging.getLogger(__name__) @@ -44,7 +44,7 @@ def run_create(cur, database_engine, *args, **kwargs): "max_stream_id_exclusive": max_stream_id + 1, "rows_inserted": 0, } - progress_json = ujson.dumps(progress) + progress_json = simplejson.dumps(progress) sql = ( "INSERT into background_updates (update_name, progress_json)"