59 Commits

Author	SHA1	Message	Date
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	ea5b5b1f64	Fix state unit test	2014-09-06 07:44:00 +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
Mark Haines	a0d1f5a014	Start updating state handling to use snapshots	2014-08-27 15:11:51 +01:00
Erik Johnston	f5fca6f787	Fix some of the tests to reflect changes in the storage layer.	2014-08-15 17:42:21 +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
Matthew Hodgson	3e35a9f96e	add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it	2014-08-13 03:32:18 +01:00
matrix.org	4f475c7697	Reference Matrix Home Server	2014-08-12 15:10:52 +01:00