diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-05-14 09:31:42 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-05-14 09:31:42 +0100 |
| commit | 977765bde2987770f63065d839f9686a7a144140 (patch) | |
| tree | 41d3a247f546cfe50500f465e50a798a597ef464 /synapse/replication/tcp/resource.py | |
| parent | remove user agent from data model, will just join on user_ips (diff) | |
| parent | Merge pull request #2846 from kaiyou/feat-dockerfile (diff) | |
| download | synapse-977765bde2987770f63065d839f9686a7a144140.tar.xz | |
Merge branch 'develop' of https://github.com/matrix-org/synapse into cohort_analytics
Diffstat (limited to 'synapse/replication/tcp/resource.py')
| -rw-r--r-- | synapse/replication/tcp/resource.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py index 786c3fe864..a41af4fd6c 100644 --- a/synapse/replication/tcp/resource.py +++ b/synapse/replication/tcp/resource.py @@ -18,8 +18,8 @@ from twisted.internet import defer, reactor from twisted.internet.protocol import Factory -from streams import STREAMS_MAP, FederationStream -from protocol import ServerReplicationStreamProtocol +from .streams import STREAMS_MAP, FederationStream +from .protocol import ServerReplicationStreamProtocol from synapse.util.metrics import Measure, measure_func |