matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2017-06-26	26	-58/+535
\|\ \| \| \| \| \| \|	erikj/ensure_round_trip
\| *	Merge pull request #2301 from xwiki-labs/push-redact-content	Erik Johnston	2017-06-24	3	-2/+48
\| \|\ \| \| \| \| \| \|	Add configuration parameter to allow redaction of content from push m…
\| \| *	Change the config file generator to more descriptive explanation of ↵	Caleb James DeLisle	2017-06-24	1	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \|	push.redact_content
\| \| *	Fix TravisCI tests for PR #2301 - Fat finger mistake	Caleb James DeLisle	2017-06-23	1	-0/+0
\| \| \|
\| \| *	Fix TravisCI tests for PR #2301	Caleb James DeLisle	2017-06-23	3	-5/+2
\| \| \|
\| \| *	Add configuration parameter to allow redaction of content from push messages ↵	Caleb James DeLisle	2017-06-23	3	-2/+43
\| \| \| \| \| \| \| \| \| \| \| \|	for google/apple devices
\| * \|	Merge pull request #2299 from matrix-org/erikj/segregate_url_cache_downloads	Erik Johnston	2017-06-23	7	-20/+94
\| \|\ \ \| \| \|/ \| \|/\|	Store URL cache preview downloads separately
\| \| *	Store URL cache preview downloads seperately	Erik Johnston	2017-06-23	7	-20/+94
\| \|/ \| \| \| \| \| \|	This makes it easier to clear old media out at a later date
\| *	Merge pull request #2297 from matrix-org/erikj/user_dir_fix	Erik Johnston	2017-06-22	1	-7/+10
\| \|\ \| \| \| \| \| \|	Fix thinko in initial public room user spam
\| \| *	Make some more params configurable	Erik Johnston	2017-06-22	1	-5/+8
\| \| \|
\| \| *	Typo. ARGH.	Erik Johnston	2017-06-22	1	-1/+1
\| \| \|
\| \| *	Fix thinko in unhandled user spam	Erik Johnston	2017-06-22	1	-2/+2
\| \|/
\| *	Merge branch 'master' into develop	Matthew Hodgson	2017-06-22	2	-1/+9
\| \|\
\| \| *	Merge pull request #2282 from matrix-org/release-v0.21.1 v0.21.1	Erik Johnston	2017-06-15	7	-218/+97
\| \| \|\ \| \| \| \| \| \| \| \|	Release v0.21.1
\| \| \| *	Bump version and changelog	Erik Johnston	2017-06-15	2	-1/+9
\| \| \| \|
\| * \| \|	Add desc	Erik Johnston	2017-06-22	1	-0/+1
\| \| \| \|
\| * \| \|	Merge pull request #2296 from matrix-org/erikj/dont_appserver_shar	Erik Johnston	2017-06-21	4	-18/+37
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Don't work out users who share room with appservice users
\| \| * \| \|	Initialise exclusive_user_regex	Erik Johnston	2017-06-21	2	-15/+22
\| \| \| \| \|
\| \| * \| \|	Fix for workers	Erik Johnston	2017-06-21	2	-1/+4
\| \| \| \| \|
\| \| * \| \|	Don't work out users who share room with appservice users	Erik Johnston	2017-06-21	1	-2/+11
\| \| \| \| \|
\| * \| \| \|	Merge pull request #2219 from krombel/avoid_duplicate_filters	Erik Johnston	2017-06-21	1	-1/+11
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	only add new filter when not existent prevoisly
\| \| * \| \|	Merge branch 'develop' into avoid_duplicate_filters	Krombel	2017-06-21	75	-593/+3545
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #2292 from matrix-org/erikj/quarantine_media	Erik Johnston	2017-06-19	7	-5/+121
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add API to quarantine media
\| \| * \| \| \|	Handle thumbnail urls	Erik Johnston	2017-06-19	1	-12/+14
\| \| \| \| \| \|
\| \| * \| \| \|	Add API to quarantine media	Erik Johnston	2017-06-19	7	-5/+119
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #2291 from matrix-org/erikj/shutdown_room	Erik Johnston	2017-06-19	7	-5/+205
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add shutdown room API
\| \| * \| \| \|	Handle all cases of sending membership events	Erik Johnston	2017-06-19	1	-0/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Remove unused import	Erik Johnston	2017-06-19	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Change to create new room and join other users	Erik Johnston	2017-06-19	2	-10/+70
\| \| \| \| \| \|
\| \| * \| \| \|	Forget room	Erik Johnston	2017-06-19	1	-0/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Add shutdown room API	Erik Johnston	2017-06-19	6	-1/+134
\| \|/ / / /
\| \| * \| \|	replaced json.dumps with encode_canonical_json	Krombel	2017-06-21	1	-1/+2
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' into avoid_duplicate_filters	Krombel	2017-05-16	10	-13/+101
\| \| \|\ \ \
\| \| * \| \| \|	avoid access-error if no filter_id matches	Krombel	2017-05-15	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	insert whitespace to fix travis build	Krombel	2017-05-12	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	add check to only add a new filter if the same filter does not exist previously	Krombel	2017-05-11	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Matthias Kesler <krombel@krombel.de>
* \| \| \| \| \|	Reject local events that don't round trip the DB	Erik Johnston	2017-06-19	1	-0/+9
\|/ / / / /
* \| \| \| \|	add missing boolean to synapse_port_db	Matthew	2017-06-16	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	fix synapse_port script	Matthew	2017-06-16	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2286 from matrix-org/erikj/split_out_user_dir	Erik Johnston	2017-06-16	6	-7/+328
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Split out user directory to a separate process
\| * \| \| \| \|	Initial worker impl	Erik Johnston	2017-06-16	6	-7/+328
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2280 from matrix-org/erikj/share_room_user_dir	Erik Johnston	2017-06-16	5	-60/+508
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include users who you share a room with in user directory
\| * \| \| \| \|	Include users who share room with requester in user directory	Erik Johnston	2017-06-15	3	-26/+47
\| \| \| \| \| \|
\| * \| \| \| \|	Implement updating users who share rooms on the fly	Erik Johnston	2017-06-15	2	-24/+235
\| \| \| \| \| \|
\| * \| \| \| \|	Implement initial population of users who share rooms table	Erik Johnston	2017-06-15	2	-9/+193
\| \| \| \| \| \|
\| * \| \| \| \|	Add DB schema for tracking users who share rooms	Erik Johnston	2017-06-15	2	-1/+33
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2285 from krombel/allow_authorization_header	Erik Johnston	2017-06-16	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	allow Authorization header
\| * \| \| \| \| \|	allow Authorization header which handling got implemented in #1098	Krombel	2017-06-16	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Matthias Kesler <krombel@krombel.de>
* \| \| \| \| \|	Merge pull request #2281 from matrix-org/erikj/phone_home_stats	Erik Johnston	2017-06-15	5	-217/+88
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|	Fix phone home stats
\| * \| \| \| \|	Typo	Erik Johnston	2017-06-15	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add some more stats	Erik Johnston	2017-06-15	3	-0/+35
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unhelpful test	Erik Johnston	2017-06-15	1	-115/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Fix phone home stats	Erik Johnston	2017-06-14	3	-107/+56
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	add notes on running out of FDs	Matthew Hodgson	2017-06-14	1	-0/+24
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #2279 from matrix-org/erikj/fix_user_dir	Erik Johnston	2017-06-13	2	-4/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix user directory insertion due to missing room_id
\| * \| \| \|	Fix user directory insertion due to missing room_id	Erik Johnston	2017-06-13	2	-4/+9
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2278 from matrix-org/erikj/fix_user_dir	Erik Johnston	2017-06-13	1	-24/+41
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix user dir to not assume existence of user
\| * \| \| \|	Fix up sql	Erik Johnston	2017-06-13	1	-10/+12
\| \| \| \| \|
\| * \| \| \|	Fix user dir to not assume existence of user	Erik Johnston	2017-06-13	1	-22/+37
\|/ / / /
* \| \| \|	Merge pull request #2274 from matrix-org/erikj/cache_is_host_joined	Erik Johnston	2017-06-13	3	-2/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add cache for is_host_joined
\| * \| \| \|	Add cache for is_host_joined	Erik Johnston	2017-06-13	3	-2/+7
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2275 from matrix-org/erikj/tweark_user_directory_search	Erik Johnston	2017-06-13	1	-13/+40
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Tweak the ranking of PG user dir search
\| * \| \| \| \|	Tweak the ranking of PG user dir search	Erik Johnston	2017-06-13	1	-13/+40
\| \|/ / / /
* \| \| \| \|	Merge pull request #2276 from matrix-org/erikj/fix_user_di	Erik Johnston	2017-06-13	1	-3/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't assume existence of events when updating user directory
\| * \| \| \| \|	Don't assume existance of events when updating user directory	Erik Johnston	2017-06-13	1	-3/+6
\| \|/ / / /
* \| \| \| \|	Merge pull request #2277 from matrix-org/erikj/media	Erik Johnston	2017-06-13	1	-0/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Throw exception when not retrying when downloading media
\| * \| \| \|	Throw exception when not retrying when downloading media	Erik Johnston	2017-06-13	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #2266 from matrix-org/erikj/host_in_room	Erik Johnston	2017-06-12	5	-55/+31
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Change is_host_joined to use current_state table
\| * \| \| \|	Tweak SQL	Erik Johnston	2017-06-09	1	-3/+6
\| \| \| \| \|
\| * \| \| \|	Fix replication	Erik Johnston	2017-06-09	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Change is_host_joined to use current_state table	Erik Johnston	2017-06-09	4	-54/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This bypasses a bug where using the state groups to figure out if a host is in a room sometimes errors if the servers isn't in the room. (For example when the server rejected an invite to a remote room)
* \| \| \| \|	Merge pull request #2269 from matrix-org/erikj/cache_state_delta	Erik Johnston	2017-06-09	2	-4/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cache state deltas
\| * \| \| \| \|	Fix replication	Erik Johnston	2017-06-09	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Comments	Erik Johnston	2017-06-09	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Cache state deltas	Erik Johnston	2017-06-09	1	-3/+12
\|/ / / / /
* \| \| \| \|	Merge pull request #2268 from matrix-org/erikj/entity_has_changed	Erik Johnston	2017-06-09	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix has_any_entity_changed
\| * \| \| \| \|	Rewrite conditional	Erik Johnston	2017-06-09	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix has_any_entity_changed	Erik Johnston	2017-06-09	1	-4/+4
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Occaisonally has_any_entity_changed would throw the error: "Set changed size during iteration" when taking the max of the `sorteddict`. While its uncertain how that happens, its quite inefficient to iterate over the entire dict anyway so we change to using the more traditional `bisect_*` functions.
* \| \| \| \|	Merge pull request #2267 from matrix-org/erikj/missing_notifier	Erik Johnston	2017-06-09	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix removing of pushers when using workers
\| * \| \| \| \|	Add missing notifier	Erik Johnston	2017-06-09	1	-1/+2
\| \|/ / / /
* \| \| \| \|	Merge pull request #2265 from matrix-org/erikj/remote_leave_outlier	Erik Johnston	2017-06-09	1	-0/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Mark remote invite rejections as outliers
\| * \| \| \|	Comment	Erik Johnston	2017-06-09	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Mark remote invite rejections as outliers	Erik Johnston	2017-06-09	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #2263 from matrix-org/erikj/fix_state_woes	Erik Johnston	2017-06-08	2	-7/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Ensure we don't use unpersisted state group as prev group
\| * \| \| \|	Ensure we don't use unpersisted state group as prev group	Erik Johnston	2017-06-08	2	-7/+19
\|/ / / /
* \| \| \|	Merge pull request #2259 from matrix-org/erikj/fix_state_woes	Erik Johnston	2017-06-07	3	-10/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix bug where state_group tables got corrupted
\| * \| \| \|	Fix bug where state_group tables got corrupted	Erik Johnston	2017-06-07	3	-10/+24
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is due to the fact that we prefilled caches using txn.call_after, which always gets called including on error. We fix this by making txn.call_after only fire when a transaction completes successfully, which is what we want most of the time anyway.
* \| \| \|	Merge pull request #2258 from matrix-org/erikj/user_dir	Erik Johnston	2017-06-07	2	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Don't start user_directory handling on workers
\| * \| \| \|	Don't start user_directory handling on workers	Erik Johnston	2017-06-07	2	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2248 from matrix-org/erikj/state_fixup	Erik Johnston	2017-06-07	7	-56/+156
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Faster cache for get_joined_hosts
\| * \| \| \|	Comments	Erik Johnston	2017-06-07	2	-0/+15
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_fixup	Erik Johnston	2017-06-07	16	-12/+1175
\| \|\ \ \ \
\| * \| \| \| \|	Remove spurious log lines	Erik Johnston	2017-06-07	3	-4/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Handle None state group correctly	Erik Johnston	2017-05-26	2	-4/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Fix typing tests	Erik Johnston	2017-05-26	2	-7/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Faster cache for get_joined_hosts	Erik Johnston	2017-05-25	5	-29/+117
\| \| \| \| \| \|
\| * \| \| \| \|	Don't return weird prev_group	Erik Johnston	2017-05-25	1	-8/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unused options	Erik Johnston	2017-05-25	1	-11/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Add some logging to user directory	Erik Johnston	2017-06-07	1	-0/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2256 from matrix-org/erikj/faster_device_updates	Erik Johnston	2017-06-07	2	-13/+65
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Split up device_lists_outbound_pokes table for faster updates.
\| * \| \| \| \|	When pruning, delete from device_lists_outbound_last_success	Erik Johnston	2017-06-07	1	-0/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Keep pruning background task	Erik Johnston	2017-06-07	1	-0/+45
\| \| \| \| \| \|
\| * \| \| \| \|	Split up device_lists_outbound_pokes table for faster updates.	Erik Johnston	2017-06-07	2	-58/+57
\|/ / / / /
* \| \| \| \|	Increase size of IP cache	Erik Johnston	2017-06-07	1	-1/+6
\| \| \| \| \|
* \| \| \| \|	Fix typo when getting app name	Erik Johnston	2017-06-06	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Fix wrong number of arguments	Erik Johnston	2017-06-06	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2253 from matrix-org/erikj/user_dir	Erik Johnston	2017-06-01	2	-0/+74
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Handle profile updates in user directory
\| * \| \| \| \|	Handle profile updates in user directory	Erik Johnston	2017-06-01	2	-0/+74
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2252 from matrix-org/erikj/user_dir	Erik Johnston	2017-06-01	13	-1/+1043
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a user directory
\| * \| \| \| \|	Fix sqlite	Erik Johnston	2017-06-01	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Split the table in two	Erik Johnston	2017-06-01	4	-31/+138
\| \| \| \| \| \|
\| * \| \| \| \|	Tweak search query	Erik Johnston	2017-06-01	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Tweak search query	Erik Johnston	2017-06-01	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Comments	Erik Johnston	2017-06-01	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Check if host is still in room	Erik Johnston	2017-06-01	1	-0/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Remove spurious inlineCallbacks	Erik Johnston	2017-06-01	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Fix removing users	Erik Johnston	2017-06-01	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Bug fixes and logging	Erik Johnston	2017-06-01	2	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Check if room is public when a user joins before adding to user dir - Fix typo of field name "content.join_rules" -> "content.join_rule"
\| * \| \| \| \|	Order by if they have profile info	Erik Johnston	2017-06-01	1	-2/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Use prefix matching	Erik Johnston	2017-06-01	1	-5/+29
\| \| \| \| \| \|
\| * \| \| \| \|	Comment on why arbitrary comments	Erik Johnston	2017-05-31	1	-2/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Use unique indices	Erik Johnston	2017-05-31	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Comment briefly on how we keep user_directory up to date	Erik Johnston	2017-05-31	1	-0/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Convert to int	Erik Johnston	2017-05-31	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Lifts things into separate function	Erik Johnston	2017-05-31	1	-56/+54
\| \| \| \| \| \|
\| * \| \| \| \|	Typos	Erik Johnston	2017-05-31	1	-8/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Fix tests	Erik Johnston	2017-05-31	2	-2/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Fix typo	Erik Johnston	2017-05-31	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Limit number of things we fetch out of the db	Erik Johnston	2017-05-31	1	-9/+30
\| \| \| \| \| \|
\| * \| \| \| \|	Add stream change cache	Erik Johnston	2017-05-31	4	-1/+34
\| \| \| \| \| \|
\| * \| \| \| \|	Split out directory and search tables	Erik Johnston	2017-05-31	2	-29/+56
\| \| \| \| \| \|
\| * \| \| \| \|	Pull max id from correct table	Erik Johnston	2017-05-31	2	-4/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Handle the server leaving a public room	Erik Johnston	2017-05-31	4	-3/+46
\| \| \| \| \| \|
\| * \| \| \| \|	Add comments	Erik Johnston	2017-05-31	4	-45/+173
\| \| \| \| \| \|
\| * \| \| \| \|	Weight differently	Erik Johnston	2017-05-31	2	-10/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Use POST	Erik Johnston	2017-05-31	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add REST API	Erik Johnston	2017-05-31	2	-0/+61
\| \| \| \| \| \|
\| * \| \| \| \|	Add search	Erik Johnston	2017-05-31	2	-0/+38
\| \| \| \| \| \|
\| * \| \| \| \|	Update room column when room becomes unpublic	Erik Johnston	2017-05-31	2	-2/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Add call later	Erik Johnston	2017-05-31	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Start later	Erik Johnston	2017-05-31	1	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Don't go round in circles	Erik Johnston	2017-05-31	1	-4/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add user_directory to database	Erik Johnston	2017-05-31	6	-1/+444
\|/ / / / /
* \| \| \| \|	Merge pull request #2251 from matrix-org/erikj/current_state_delta_stream	Erik Johnston	2017-05-30	2	-8/+50
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Add current_state_delta_stream table
\| * \| \| \|	Add comment	Erik Johnston	2017-05-30	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add clobbered event_id	Erik Johnston	2017-05-30	2	-1/+3
\| \| \| \| \|
\| * \| \| \|	Add current_state_delta_stream table	Erik Johnston	2017-05-30	2	-8/+48
\|/ / / /
* \| \| \|	Merge pull request #2247 from matrix-org/erikj/auth_event	Erik Johnston	2017-05-24	5	-13/+118
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Only store event_auth for state events
\| * \| \| \|	Add background task to clear out old event_auth	Erik Johnston	2017-05-24	3	-1/+74
\| \| \| \| \|
\| * \| \| \|	Only store event_auth for state events	Erik Johnston	2017-05-24	3	-12/+44
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2243 from matrix-org/matthew/fix-url-preview-length-again	Erik Johnston	2017-05-23	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	actually trim oversize og:description meta
\| * \| \| \| \|	actually trim oversize og:description meta	Matthew Hodgson	2017-05-22	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2237 from matrix-org/erikj/sync_key_count	Erik Johnston	2017-05-23	4	-15/+34
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Add count of one time keys to sync stream
\| * \| \| \| \|	Remove redundant invalidation	Erik Johnston	2017-05-23	1	-3/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Missed an invalidation	Erik Johnston	2017-05-23	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Add missing storage function to slave store	Erik Johnston	2017-05-22	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Stream count_e2e_one_time_keys cache invalidation	Erik Johnston	2017-05-22	1	-13/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Add count of one time keys to sync stream	Erik Johnston	2017-05-19	2	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2242 from matrix-org/erikj/email_refactor	Erik Johnston	2017-05-23	5	-60/+106
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only load jinja2 templates once
\| * \| \| \| \| \|	Only load jinja2 templates once	Erik Johnston	2017-05-22	5	-60/+106
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of every time a new email pusher is created, as loading jinja2 templates is slow.
* \| \| \| \| \|	Merge pull request #2241 from matrix-org/erikj/fix_notifs	Erik Johnston	2017-05-22	1	-4/+32
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly calculate push rules for member events
\| * \| \| \| \| \|	Comment	Erik Johnston	2017-05-22	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove spurious log level guards	Erik Johnston	2017-05-22	1	-6/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Check if current event is a membership event	Erik Johnston	2017-05-22	1	-4/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add debug logging	Erik Johnston	2017-05-22	1	-0/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2240 from matrix-org/erikj/cache_list_fix	Erik Johnston	2017-05-22	1	-16/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update list cache to handle one arg case
\| * \| \| \| \| \| \|	Pull out if statement from for loop	Erik Johnston	2017-05-22	1	-6/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update list cache to handle one arg case	Erik Johnston	2017-05-22	1	-17/+33
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We update the normal cache descriptors to handle caches with a single argument specially so that the key wasn't a 1-tuple. We need to update the cache list to be aware of this.
* \| \| \| \| \| \|	Merge pull request #2238 from matrix-org/erikj/faster_push_rules	Erik Johnston	2017-05-22	1	-9/+23
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| / / / / / \| \|/ / / / /	Speed up calculating push rules
\| * \| \| \| \|	Comment	Erik Johnston	2017-05-22	1	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Use tuple unpacking	Erik Johnston	2017-05-22	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Speed up calculating push rules	Erik Johnston	2017-05-19	1	-8/+19
\|/ / / / /
* \| \| \| \|	Merge pull request #2236 from matrix-org/erikj/invalidation	Erik Johnston	2017-05-19	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalidation of get_users_with_read_receipts_in_room
\| * \| \| \| \|	Fix invalidation of get_users_with_read_receipts_in_room	Erik Johnston	2017-05-19	1	-1/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #2234 from matrix-org/erikj/fix_push	Erik Johnston	2017-05-19	5	-13/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Store ActionGenerator in HomeServer
\| * \| \| \| \|	Move invalidation cb to its own structure	Erik Johnston	2017-05-19	1	-6/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Store ActionGenerator in HomeServer	Erik Johnston	2017-05-19	5	-7/+10
\|/ / / / /
* \| \| \| \|	Don't push users who have left	Erik Johnston	2017-05-18	1	-1/+4
\| \| \| \| \|
* \| \| \| \|	Increase size of push rule caches	Erik Johnston	2017-05-18	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2233 from matrix-org/erikj/faster_as_check	Erik Johnston	2017-05-18	4	-13/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make get_if_app_services_interested_in_user faster
\| * \| \| \| \|	Make get_if_app_services_interested_in_user faster	Erik Johnston	2017-05-18	4	-13/+34
\|/ / / / /
* \| \| \| \|	Remove size of push get_rules cache	Erik Johnston	2017-05-18	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-05-18	3	-1/+8
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse v0.21.0	Erik Johnston	2017-05-18	125	-2280/+5247
\| \|\ \ \ \
\| \| * \| \| \|	Bump changelog and version github/release-v0.21.0 release-v0.21.0	Erik Johnston	2017-05-18	2	-1/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #2136 from bbigras/patch-1	Erik Johnston	2017-04-25	1	-0/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the system requirements list in README.rst
\| \| * \| \| \| \|	Fix the system requirements list in README.rst	Bruno Bigras	2017-04-19	1	-0/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #2177 from matrix-org/erikj/faster_push_rules	Erik Johnston	2017-05-18	3	-47/+252
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Make calculating push actions faster
\| * \| \| \| \|	Add comment	Erik Johnston	2017-05-18	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Faster push rule calculation via push specific cache	Erik Johnston	2017-05-17	3	-47/+249
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We add a push rule specific cache that ensures that we can reuse calculated push rules appropriately when a user join/leaves.
* \| \| \| \| \|	Merge pull request #2231 from aaronraimist/patch-1	Erik Johnston	2017-05-18	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct a typo in UPGRADE.rst
\| * \| \| \| \| \|	Correct a typo in UPGRADE.rst	Aaron Raimist	2017-05-17	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2230 from matrix-org/erikj/speed_up_get_state	Erik Johnston	2017-05-17	3	-41/+58
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Make get_state_groups_from_groups faster.
\| * \| \| \| \|	Make get_state_groups_from_groups faster.	Erik Johnston	2017-05-17	3	-41/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most of the time was spent copying a dict to filter out sentinel values that indicated that keys did not exist in the dict. The sentinel values were added to ensure that we cached the non-existence of keys. By updating DictionaryCache to keep track of which keys were known to not exist itself we can remove a dictionary copy.
* \| \| \| \| \|	Merge pull request #2216 from slipeer/app_services_interested_in_user	Erik Johnston	2017-05-17	2	-3/+6
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix users claimed non-exclusively by an app service don't get notific…
\| * \| \| \| \|	Fix users claimed non-exclusively by an app service don't get notifications ↵	Slipeer	2017-05-11	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#2211
* \| \| \| \| \|	Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-05-17	2	-1/+26
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Update changelog v0.21.0-rc3	Erik Johnston	2017-05-17	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0	Erik Johnston	2017-05-17	1	-3/+24
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2229 from matrix-org/erikj/faster_get_joined	Erik Johnston	2017-05-17	1	-3/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make get_joined_users faster when we have delta state
\| * \| \| \| \| \|	Comment	Erik Johnston	2017-05-17	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Short circuit when we have delta ids	Erik Johnston	2017-05-17	1	-3/+19
\|/ / / / / /
\| * \| \| \| \|	Spelling	Erik Johnston	2017-05-17	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Bump changelog and version	Erik Johnston	2017-05-17	2	-1/+25
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0	Erik Johnston	2017-05-17	39	-147/+668
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #2228 from matrix-org/erikj/speed_up_get_hosts	Erik Johnston	2017-05-16	2	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up get_joined_hosts
\| * \| \| \| \| \|	Speed up get_joined_hosts	Erik Johnston	2017-05-16	2	-2/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2227 from matrix-org/erikj/presence_caches	Erik Johnston	2017-05-16	2	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make presence use cached users/hosts in room
\| * \| \| \| \| \| \|	Make presence use cached users/hosts in room	Erik Johnston	2017-05-16	2	-4/+4
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #2226 from matrix-org/erikj/domain_from_id	Erik Johnston	2017-05-16	1	-3/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Speed up get_domain_from_id
\| * \| \| \| \| \|	Speed up get_domain_from_id	Erik Johnston	2017-05-16	1	-3/+3
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2224 from matrix-org/erikj/prefill_state	Erik Johnston	2017-05-16	3	-9/+26
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	Prefill state caches
\| * \| \| \| \|	Remove spurious merge artifacts	Erik Johnston	2017-05-16	1	-13/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Take a copy before prefilling, as it may be a frozendict	Erik Johnston	2017-05-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state	Erik Johnston	2017-05-15	6	-1/+38
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Update comment	Erik Johnston	2017-05-15	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Comments	Erik Johnston	2017-05-15	2	-3/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add more granular event send metrics	Erik Johnston	2017-05-15	1	-0/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Prefill state caches	Erik Johnston	2017-05-15	3	-6/+20
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #2218 from matrix-org/rav/event_search_index	Richard van der Hoff	2017-05-16	4	-12/+63
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Add an index to event_search
\| * \| \| \| \|	Add a comment to old delta	Richard van der Hoff	2017-05-11	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Don't create event_search index on sqlite	Richard van der Hoff	2017-05-11	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... because the table is virtual
\| * \| \| \| \|	Add more logging for purging	Richard van der Hoff	2017-05-11	1	-7/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log the number of events we will be deleting at info.
\| * \| \| \| \|	Add an index to event_search	Richard van der Hoff	2017-05-11	3	-3/+35
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- to make the purge API quicker
* \| \| \| \|	Merge pull request #2221 from psaavedra/sync_timeline_limit_filter_by_name	Erik Johnston	2017-05-15	4	-0/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Configurable maximum number of events requested by /sync and /messages
\| * \| \| \| \|	Fixed syntax nits	Pablo Saavedra	2017-05-15	2	-5/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed implementation errors	Pablo Saavedra	2017-05-15	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Added HS as property in SyncRestServlet * Fixed set_timeline_upper_limit function implementat¡ion
\| * \| \| \| \|	Configurable maximum number of events requested by /sync and /messages (#2220)	Pablo Saavedra	2017-05-13	4	-0/+21
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set the limit on the returned events in the timeline in the get and sync operations. The default value is -1, means no upper limit. For example, using `filter_timeline_limit: 5000`: POST /_matrix/client/r0/user/user:id/filter { room: { timeline: { limit: 1000000000000000000 } } } GET /_matrix/client/r0/user/user:id/filter/filter:id { room: { timeline: { limit: 5000 } } } The server cuts down the room.timeline.limit.
* \| \| \| \|	Merge pull request #2223 from matrix-org/erikj/ignore_not_retrying	Erik Johnston	2017-05-15	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't log exceptions for NotRetryingDestination
\| * \| \| \| \|	Don't log exceptions for NotRetryingDestination	Erik Johnston	2017-05-15	1	-1/+3
\| \|/ / / /
* \| \| \| \|	Merge pull request #2215 from hamber-dick/develop	Erik Johnston	2017-05-15	1	-0/+9
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Documantation to chek synapse version
\| * \| \| \|	Merge pull request #1 from hamber-dick/dev-branch-hamber-dick	hamber-dick	2017-05-10	1	-0/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Documantation to chek synapse version
\| \| * \| \| \|	Documantation to chek synapse version	hamber-dick	2017-05-10	1	-0/+9
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I've added some Documentation, how to get the running Version of a Synapse homeserver. This should help the HS-Owners to check whether the Upgrade was successful.
* \| \| \| \|	Merge pull request #2214 from matrix-org/rav/hurry_up_purge	Richard van der Hoff	2017-05-11	1	-20/+42
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	When purging, don't de-delta state groups we're about to delete
\| * \| \| \|	Tidy purge code and add some comments	Richard van der Hoff	2017-05-11	1	-12/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try to make this clearer with more comments and some variable renames
\| * \| \| \|	Don't de-delta state groups we're about to delete	Richard van der Hoff	2017-05-10	1	-11/+9
\| \| \| \| \|
\| * \| \| \|	add some logging to purge_history	Richard van der Hoff	2017-05-10	1	-4/+21
\| \| \| \| \|
* \| \| \| \|	Merge pull request #2213 from matrix-org/luke/username-availability-qp	Luke Barnard	2017-05-11	2	-5/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Modify register/available to be GET with query param
\| * \| \| \|	Modify condition on empty localpart	Luke Barnard	2017-05-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Modify register/available to be GET with query param	Luke Barnard	2017-05-10	2	-5/+11
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- GET is now the method for register/available - a query parameter "username" is now used Also, empty usernames are now handled with an error message on registration or via register/available: `User ID cannot be empty`
* \| \| \|	Merge pull request #2208 from matrix-org/erikj/ratelimit_overrid	Erik Johnston	2017-05-10	6	-19/+93
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Add per user ratelimiting overrides
\| * \| \|	Add per user ratelimiting overrides	Erik Johnston	2017-05-10	6	-19/+93
\| \| \| \|
* \| \| \|	Merge pull request #2206 from matrix-org/rav/one_time_key_upload_change_sig	Richard van der Hoff	2017-05-10	4	-36/+239
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Allow clients to upload one-time-keys with new sigs
\| * \| \| \|	Replace some instances of preserve_context_over_deferred	Richard van der Hoff	2017-05-09	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Do some logging when one-time-keys get claimed	Richard van der Hoff	2017-05-09	3	-0/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	might help us figure out if https://github.com/vector-im/riot-web/issues/3868 has happened.
\| * \| \| \|	Allow clients to upload one-time-keys with new sigs	Richard van der Hoff	2017-05-09	3	-33/+182
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a client retries a key upload, don't give an error if the signature has changed (but the key is the same). Fixes https://github.com/vector-im/riot-android/issues/1208, hopefully.
* \| \| \|	Merge pull request #2209 from matrix-org/luke/username-availability-post	Luke Barnard	2017-05-10	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Change register/available to POST (from GET)
\| * \| \|	Change register/available to POST (from GET)	Luke Barnard	2017-05-10	1	-1/+1
\|/ / /
* \| \|	Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-05-08	2	-1/+63
\|\\| \|
\| * \|	Bump version and changelog v0.21.0-rc2	Erik Johnston	2017-05-08	2	-1/+14
\| \| \|