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/protocol.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/protocol.py')
| -rw-r--r-- | synapse/replication/tcp/protocol.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py index 0a9a290af4..d7d38464b2 100644 --- a/synapse/replication/tcp/protocol.py +++ b/synapse/replication/tcp/protocol.py @@ -53,12 +53,12 @@ from twisted.internet import defer from twisted.protocols.basic import LineOnlyReceiver from twisted.python.failure import Failure -from commands import ( +from .commands import ( COMMAND_MAP, VALID_CLIENT_COMMANDS, VALID_SERVER_COMMANDS, ErrorCommand, ServerCommand, RdataCommand, PositionCommand, PingCommand, NameCommand, ReplicateCommand, UserSyncCommand, SyncCommand, ) -from streams import STREAMS_MAP +from .streams import STREAMS_MAP from synapse.util.stringutils import random_string from synapse.metrics.metric import CounterMetric |