Merge branch 'develop' into event_signing

Conflicts:
	synapse/federation/replication.py
This commit is contained in:
Mark Haines 2014-10-17 17:33:58 +01:00
commit dc3c2823ac
21 changed files with 101 additions and 849 deletions

View file

@ -75,7 +75,7 @@ class PduCodecTestCase(unittest.TestCase):
context="rooooom",
pdu_type="m.room.message",
origin="bar.com",
ts=12345,
origin_server_ts=12345,
depth=5,
prev_pdus=[("alice", "bob.com")],
is_state=False,
@ -130,7 +130,7 @@ class PduCodecTestCase(unittest.TestCase):
context="rooooom",
pdu_type="m.room.topic",
origin="bar.com",
ts=12345,
origin_server_ts=12345,
depth=5,
prev_pdus=[("alice", "bob.com")],
is_state=True,