diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-19 14:48:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-19 14:48:19 +0100 |
| commit | 347242a5c408d4ceb1880f6b90c8e9c658226dde (patch) | |
| tree | 12a25b72d8f13a48f99441c249c3c531c79fff66 /synapse/federation | |
| parent | Fix bug where we sometimes set min_token to None. (diff) | |
| parent | Proofing (diff) | |
| download | synapse-347242a5c408d4ceb1880f6b90c8e9c658226dde.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/replication.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py index 3e5f1a4108..8030d0963f 100644 --- a/synapse/federation/replication.py +++ b/synapse/federation/replication.py @@ -158,6 +158,7 @@ class ReplicationLayer(object): # TODO, add errback, etc. self._transaction_queue.enqueue_edu(edu) + return defer.succeed(None) @log_function def make_query(self, destination, query_type, args): |