summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-11 00:35:13 +0100
committerGitHub <noreply@github.com>2018-05-11 00:35:13 +0100
commit23e2dfe9405baf8495c207c884153d6a9555f3e6 (patch)
treef4f3d48b4d347f7a43489179fbdc1f118965ef38 /synapse
parentMerge remote-tracking branch 'origin/master' into develop (diff)
parenttransaction_id, destination twice (diff)
downloadsynapse-23e2dfe9405baf8495c207c884153d6a9555f3e6.tar.xz
Merge pull request #3209 from damir-manapov/master
transaction_id, destination defined twice
Diffstat (limited to 'synapse')
-rw-r--r--synapse/federation/units.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index 3f645acc43..01c5b8fe17 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -74,8 +74,6 @@ class Transaction(JsonEncodedObject):
         "previous_ids",
         "pdus",
         "edus",
-        "transaction_id",
-        "destination",
         "pdu_failures",
     ]