Kegan Dougal 4edcbcee3b Merge branch 'develop' into application-services-txn-reliability ...

Conflicts:
	synapse/storage/__init__.py

2015-03-26 10:07:59 +00:00

..

__init__.py

…

test__base.py

Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict()

2015-03-25 19:05:34 +00:00

test_appservice.py

Use event IDs instead of dumping event content in the txns table.

2015-03-09 17:25:20 +00:00

test_base.py

Tidy up _simple_... methods

2015-03-20 15:05:10 +00:00

test_directory.py

…

test_presence.py

…

test_profile.py

…

test_redaction.py

…

test_registration.py

…

test_room.py

Tidy up _simple_... methods

2015-03-20 15:05:10 +00:00

test_roommember.py

…

test_stream.py

…