Mark Haines e903c941cb Merge branch 'develop' into request_logging ... Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py		2014-11-14 11:16:50 +00:00
..
api	Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY	2014-09-12 18:46:13 +01:00
events	Fix validation tests	2014-11-11 10:31:59 +00:00
federation	SYN-103: Remove "origin" and "destination" keys from edus	2014-11-13 15:49:03 +00:00
handlers	SYN-103: Remove "origin" and "destination" keys from edus	2014-11-13 15:49:03 +00:00
rest	Only allow people in a room to look up room state.	2014-11-11 17:55:32 +00:00
storage	Fix SQLBaseStoreTestCase	2014-11-10 15:32:35 +00:00
util	Add a request-id to each log line	2014-10-30 01:21:33 +00:00
__init__.py	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
test_distributor.py	Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY	2014-09-12 18:46:13 +01:00
test_state.py	Rename annotate_state_groups to annotate_event_with_state	2014-11-11 16:58:53 +00:00
test_types.py	Have all unit tests import from our own subclass of trial's unittest TestCase; set up logging in ONE PLACE ONLY	2014-09-12 18:46:13 +01:00
unittest.py	Added a useful unit test primitive for asserting object attributes	2014-09-17 15:56:40 +01:00
utils.py	Sign outgoing PDUs.	2014-10-16 00:09:48 +01:00