12 commits

Author	SHA1	Message	Date
Erik Johnston	39e3fc69e5	Make the state resolution use actual power levels rather than taking them from a Pdu key.	2014-09-12 17:11:09 +01:00
Erik Johnston	942d8412c4	Handle the case where we don't have a common ancestor	2014-09-08 20:13:27 +01:00
Erik Johnston	83ce57302d	Fix bug in state handling where we incorrectly identified a missing pdu. Update tests to catch this case.	2014-09-08 19:50:59 +01:00
Erik Johnston	2205aba3ed	Fix bug where we used an event_id as a pdu_id	2014-09-06 07:41:51 +01:00
Matthew Hodgson	8a7c1d6a00	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
Erik Johnston	b5f9d47c89	Handle new state events which don't have a common ancestor	2014-09-03 15:50:05 +01:00
Mark Haines	a0d1f5a014	Start updating state handling to use snapshots	2014-08-27 15:11:51 +01:00
Erik Johnston	0e938b1ff7	Rename method name to not clash with other ones in storage.	2014-08-15 16:47:48 +01:00
Erik Johnston	c5f2da5875	Add a check to make sure that during state conflict res we only request a PDU we don't have.	2014-08-15 11:47:01 +01:00
Erik Johnston	1a26905cc9	Fix pontenial bug in state resolution handler that compared dicts rather than their id's	2014-08-15 11:41:20 +01:00
Matthew Hodgson	f98e6380f1	add in whitespace after copyright statements to improve legibility	2014-08-13 03:14:34 +01:00
matrix.org	4f475c7697	Reference Matrix Home Server	2014-08-12 15:10:52 +01:00