diff options
author | Erik Johnston <erik@matrix.org> | 2017-05-03 09:46:40 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-05-03 09:46:40 +0100 |
commit | 8346e6e696e6f0052bc0f68ee825c2b08da2387d (patch) | |
tree | 11969ca353dc86c798e3fa6fc094d6b4530ffc25 /tests/storage | |
parent | Prefill state caches (diff) | |
parent | Merge pull request #2178 from matrix-org/erikj/message_metrics (diff) | |
download | synapse-8346e6e696e6f0052bc0f68ee825c2b08da2387d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state
Diffstat (limited to 'tests/storage')
-rw-r--r-- | tests/storage/event_injector.py | 4 | ||||
-rw-r--r-- | tests/storage/test_events.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/storage/event_injector.py b/tests/storage/event_injector.py |