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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Newsfile	Erik Johnston	2018-10-17	1	-0/+1
\|
*	Fix bug where we raised StopIteration in a generator	Erik Johnston	2018-10-17	1	-2/+5
\| \| \| \|	This made python 3.7 unhappy
*	Fix roomlist since tokens on Python 3 (#4046)	Will Hunt	2018-10-17	4	-3/+50
\| \| \|	Thanks @Half-Shot !!!
*	Merge pull request #4045 from matrix-org/rav/fix_get_missing_events	Richard van der Hoff	2018-10-17	5	-35/+26
\|\ \| \| \| \|	Fix incorrect truncation in get_missing_events
\| *	Fix incorrect truncation in get_missing_events	Richard van der Hoff	2018-10-16	5	-35/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's quite important that get_missing_events returns the latest events in the room; however we were pulling event ids out of the database until we got at least 10, and then taking the earliest of the results. We also shouldn't really be relying on depth, and should be checking the room_id.
* \|	Merge pull request #4041 from matrix-org/rav/run_tests_in_docker	Amber Brown	2018-10-17	3	-43/+51
\|\ \ \| \|/ \|/\|	run the circle builds in docker containers
\| *	Use wget rather than curl	Richard van der Hoff	2018-10-16	1	-2/+2
\| \| \| \| \| \| \| \|	the docker image doesn't have wget
\| *	changelog	Richard van der Hoff	2018-10-16	1	-0/+1
\| \|
\| *	run the circle builds in docker containers	Richard van der Hoff	2018-10-16	1	-41/+48
\|/ \| \| \|	Docker containers spin up faster than entire VMs.
*	Various cleanups in the federation client code (#4031)	Richard van der Hoff	2018-10-16	4	-61/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Improve logging: log things in the right order, include destination and txids in all log lines, don't log successful responses twice - Fix the docstring on TransportLayerClient.send_transaction - Don't use treq.request, which is overcomplicated for our purposes: just use a twisted.web.client.Agent. - simplify the logic for setting up the bodyProducer - fix bytes/str confusions
*	Merge pull request #4019 from matrix-org/dbkr/e2e_backups	David Baker	2018-10-15	10	-0/+1442
\|\ \| \| \| \|	E2E backups
\| *	missed one	David Baker	2018-10-12	1	-0/+1
\| \|
\| *	Linting soothes the savage PEP8 monster	David Baker	2018-10-12	1	-4/+9
\| \|
\| *	Misc PR feedback bits	David Baker	2018-10-12	1	-2/+2
\| \|
\| *	Don't mangle exceptions	David Baker	2018-10-12	1	-4/+2
\| \|
\| *	Split /room_keys/version into 2 servlets	David Baker	2018-10-12	1	-9/+21
\| \|
\| *	PR feedback pt. 1	David Baker	2018-10-12	3	-29/+22
\| \|
\| *	Fix mergefail	David Baker	2018-10-09	1	-1/+1
\| \|
\| *	Add changelog	David Baker	2018-10-09	1	-0/+1
\| \|
\| *	isort	David Baker	2018-10-09	1	-1/+1
\| \|
\| *	Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups	David Baker	2018-10-09	210	-3221/+5551
\| \|\
\| * \|	Apparently this blank line is Very Important	David Baker	2018-10-09	1	-0/+1
\| \| \|
\| * \|	be python3 compatible	David Baker	2018-10-09	1	-2/+3
\| \| \|
\| * \|	Don't reuse backup versions	David Baker	2018-10-05	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we don't actually delete the keys, just mark the versions as deleted in the db rather than actually deleting them, then we won't reuse versions. Fixes https://github.com/vector-im/riot-web/issues/7448
\| * \|	WIP e2e key backups	David Baker	2018-09-13	2	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Continues from uhoreg's branch This just fixed the errcode on /room_keys/version if no backup and updates the schema delta to be on the latest so it gets run
\| * \|	try to make flake8 and isort happy	Hubert Chathi	2018-09-06	5	-8/+15
\| \| \|
\| * \|	update to newer Synapse APIs	Hubert Chathi	2018-08-24	2	-1/+2
\| \| \|
\| * \|	Merge branch 'develop' into e2e_backups	Hubert Chathi	2018-08-24	232	-4107/+7197
\| \|\ \
\| * \| \|	allow session_data to be any JSON instead of just a string	Hubert Chathi	2018-08-21	1	-2/+4
\| \| \| \|
\| * \| \|	allow auth_data to be any JSON instead of a string	Hubert Chathi	2018-08-21	1	-2/+5
\| \| \| \|
\| * \| \|	missing import	Matthew Hodgson	2018-08-12	1	-1/+1
\| \| \| \|
\| * \| \|	missing import	Matthew Hodgson	2018-08-12	1	-0/+1
\| \| \| \|
\| * \| \|	use parse_string	Matthew Hodgson	2018-08-12	1	-3/+3
\| \| \| \|
\| * \| \|	404 nicely if you try to interact with a missing current version	Matthew Hodgson	2018-08-12	2	-16/+57
\| \| \| \|
\| * \| \|	support DELETE /version with no args	Matthew Hodgson	2018-08-12	2	-3/+4
\| \| \| \|
\| * \| \|	flake8	Matthew Hodgson	2018-08-12	2	-9/+14
\| \| \| \|
\| * \| \|	implement remaining tests and make them work	Matthew Hodgson	2018-08-12	4	-33/+287
\| \| \| \|
\| * \| \|	linting	Matthew Hodgson	2018-08-12	1	-25/+23
\| \| \| \|
\| * \| \|	fix idiocies and so make tests pass	Matthew Hodgson	2018-08-12	3	-11/+15
\| \| \| \|
\| * \| \|	first cut at a UT	Matthew Hodgson	2018-08-12	1	-0/+141
\| \| \| \|
\| * \| \|	don't needlessly return user_id	Matthew Hodgson	2018-08-12	1	-1/+0
\| \| \| \|
\| * \| \|	improve docstring	Matthew Hodgson	2018-08-12	1	-1/+5
\| \| \| \|
\| * \| \|	switch get_current_version_info back to being get_version_info	Matthew Hodgson	2018-08-12	1	-4/+7
\| \| \| \|
\| * \| \|	fix flakes	Matthew Hodgson	2018-08-12	2	-4/+6
\| \| \| \|
\| * \| \|	fix typos	Matthew Hodgson	2018-08-12	2	-2/+3
\| \| \| \|
\| * \| \|	add a tonne of docstring; make upload_room_keys properly assert version	Matthew Hodgson	2018-08-12	2	-9/+113
\| \| \| \|
\| * \| \|	add a tonne of docstring; make upload_room_keys properly assert version	Matthew Hodgson	2018-08-12	1	-20/+31
\| \| \| \|
\| * \| \|	more docstring for the e2e_room_keys rest	Matthew Hodgson	2018-08-12	2	-2/+51
\| \| \| \|
\| * \| \|	add storage docstring; remove unused set_e2e_room_keys	Matthew Hodgson	2018-08-12	1	-36/+83
\| \| \| \|
\| * \| \|	fix factoring out of _should_replace_room_key	Matthew Hodgson	2018-08-12	1	-3/+4
\| \| \| \|
\| * \| \|	rename room_key_version table correctly, and fix opt args	Matthew Hodgson	2018-08-12	2	-16/+16
\| \| \| \|
\| * \| \|	blindly incorporate PR review - needs testing & fixing	Matthew Hodgson	2018-08-12	5	-79/+99
\| \| \| \|
\| * \| \|	make /room_keys/version work	Matthew Hodgson	2018-08-12	4	-15/+38
\| \| \| \|
\| * \| \|	implement /room_keys/version too (untested)	Matthew Hodgson	2018-08-12	5	-6/+171
\| \| \| \|
\| * \| \|	document the API	Matthew Hodgson	2018-08-12	1	-0/+133
\| \| \| \|
\| * \| \|	make it work and fix pep8	Matthew Hodgson	2018-08-12	7	-82/+134
\| \| \| \|
\| * \| \|	interim WIP checkin; doesn't build yet	Matthew Hodgson	2018-08-12	3	-19/+84
\| \| \| \|
\| * \| \|	total WIP skeleton for /room_keys API	Matthew Hodgson	2018-08-12	4	-0/+289
\| \| \| \|
* \| \| \|	Merge pull request #4033 from intelfx/py37-hotfixes	Amber Brown	2018-10-15	3	-3/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	py3: python3.7 hotfixes
\| * \| \| \|	synapse/app: frontend_proxy.py: actually make workers work on py3	Ivan Shapovalov	2018-10-14	2	-2/+3
\| \| \| \| \|
\| * \| \| \|	synapse/visibility.py: fix SyntaxError on py3.7	Ivan Shapovalov	2018-10-14	2	-1/+2
\|/ / / /
* \| \| \|	Make workers work on Py3 (#4027)	Amber Brown	2018-10-13	13	-62/+64
\| \| \| \|
* \| \| \|	Comments on get_all_new_events_stream	Richard van der Hoff	2018-10-12	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	just some docstrings to clarify the behaviour here
* \| \| \|	Merge pull request #4022 from matrix-org/erikj/metrics_lazy_loaded_count	Erik Johnston	2018-10-10	2	-8/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add metric to count lazy member sync requests
\| * \| \| \|	Add description to counter metric	Erik Johnston	2018-10-10	1	-1/+5
\| \| \| \| \|
\| * \| \| \|	Update newsfile	Erik Johnston	2018-10-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Track number of non-empty sync responses instead	Erik Johnston	2018-10-10	1	-9/+15
\| \| \| \| \|
\| * \| \| \|	Append _total to metric and fix up spelling	Erik Johnston	2018-10-10	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Newsfile	Erik Johnston	2018-10-09	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add metric to count lazy member sync requests	Erik Johnston	2018-10-09	1	-6/+20
\|/ / / /
* \| \| \|	Merge pull request #4008 from matrix-org/erikj/log_looping_exceptions	Erik Johnston	2018-10-09	3	-13/+36
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Log looping call exceptions
\| * \| \|	Remove unnecessary extra function call layer	Erik Johnston	2018-10-08	2	-31/+16
\| \| \| \|
\| * \| \|	Use errback pattern and catch async failures	Erik Johnston	2018-10-08	2	-15/+35
\| \| \| \|
\| * \| \|	Newsfile	Erik Johnston	2018-10-05	1	-0/+1
\| \| \| \|
\| * \| \|	Log looping call exceptions	Erik Johnston	2018-10-05	1	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a looping call function errors, then it kills the loop entirely. Currently it throws away the exception logs, so we should make it actually log them. Fixes #3929
* \| \| \|	Merge pull request #4017 from matrix-org/rav/optimise_filter_events_for_server	Richard van der Hoff	2018-10-09	2	-7/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Optimisation for filter_events_for_server
\| * \| \|	Optimisation for filter_events_for_server	Richard van der Hoff	2018-10-08	2	-7/+7
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're better off hashing just the event_id than the whole ((type, state_key), event_id) tuple - so use a dict instead of a set. Also, iteritems > items.
* \| \|	Merge pull request #3995 from matrix-org/rav/no_deextrem_outliers	Richard van der Hoff	2018-10-04	2	-33/+70
\|\ \ \ \| \| \| \| \| \| \| \|	Fix bug in forward_extremity update logic
\| * \| \|	actually exclude outliers	Richard van der Hoff	2018-10-03	1	-1/+2
\| \| \| \|
\| * \| \|	fix newsfile name	Richard van der Hoff	2018-10-03	1	-0/+0
\| \| \| \|
\| * \| \|	remove debugging	Richard van der Hoff	2018-10-02	1	-10/+0
\| \| \| \|
\| * \| \|	Fix bug in forward_extremity update logic	Richard van der Hoff	2018-10-02	2	-33/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	An event does not stop being a forward_extremity just because an outlier or rejected event refers to it.
* \| \| \|	Merge branch 'master' into develop	Amber Brown	2018-10-04	63	-66/+88
\|\ \ \ \
\| * \| \| \|	changelog v0.33.6 github/release-v0.33.6 release-v0.33.6	Amber Brown	2018-10-04	2	-1/+9
\| \| \| \| \|
\| * \| \| \|	full version	Amber Brown	2018-10-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #4002 from matrix-org/rav/pin_prometheus	Richard van der Hoff	2018-10-03	2	-1/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Pin to prometheus_client<0.4 to avoid renaming all of our metrics
\| \| * \| \| \|	Pin to prometheus_client<0.4 to avoid renaming all of our metrics	Richard van der Hoff	2018-10-03	2	-1/+5
\| \|/ / / /
\| * \| \| \|	Merge pull request #3998 from ↵	Richard van der Hoff	2018-10-03	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matrix-org/michaelkaye/build_docker_images_of_rc_tags Docker build all tags starting vX.Y.Z, including release candidates
\| \| * \| \| \|	Docker build all tags starting vX.Y.Z, inc RCs	Michael Kaye	2018-10-03	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note the regex must match the complete string anyway, so the leading ^ was useless.
\| * \| \| \|	some changelog fixes	Amber Brown	2018-10-03	1	-8/+4
\| \| \| \| \|
\| * \| \| \|	changelog v0.33.6rc1	Amber Brown	2018-10-03	60	-61/+75
\| \| \| \| \|
\| * \| \| \|	version	Amber Brown	2018-10-03	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion	Erik Johnston	2018-10-03	2	-5/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix handling of rejected threepid invites
\| * \| \| \|	Sanitise error messages when user doesn't have permission to invite	Erik Johnston	2018-10-03	1	-5/+2
\| \| \| \| \|
\| * \| \| \|	Newsfile	Erik Johnston	2018-10-03	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix handling of rejected threepid invites	Erik Johnston	2018-10-03	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration	Erik Johnston	2018-10-03	2	-2/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix exception in background metrics collection
\| * \| \| \|	Newsfile	Erik Johnston	2018-10-03	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix exception in background metrics collection	Erik Johnston	2018-10-03	1	-2/+6
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We attempted to iterate through a list on a separate thread without doing the necessary copying.
* \| \| \|	Merge pull request #3997 from matrix-org/erikj/fix_profile_error_handling	Erik Johnston	2018-10-03	2	-6/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Fix exception handling in fetching remote profiles
\| * \| \|	Newsfile	Erik Johnston	2018-10-03	1	-0/+1
\| \| \| \|
\| * \| \|	Fix exception handling in fetching remote profiles	Erik Johnston	2018-10-03	1	-6/+2
\|/ / /
* \| \|	Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache	Erik Johnston	2018-10-02	3	-1/+47
\|\ \ \ \| \| \| \| \| \| \| \|	Fix bug when invalidating destination retry timings
\| * \| \|	Add tests	Erik Johnston	2018-10-02	1	-0/+45
\| \| \| \|
\| * \| \|	Newsfile	Erik Johnston	2018-10-02	1	-0/+1
\| \| \| \|
\| * \| \|	Fix bug when invalidating destination retry timings	Erik Johnston	2018-10-02	1	-1/+1
\| \| \| \|
* \| \| \|	Remove Jenkins & other old dev junk (#3988)	Amber Brown	2018-10-03	12	-278/+4
\|/ / /
* \| \|	Merge pull request #3960 from matrix-org/rav/fix_missing_create_event_error	Richard van der Hoff	2018-10-02	2	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Fix error handling for missing auth_event
\| * \ \	Merge branch 'develop' into rav/fix_missing_create_event_error	Richard van der Hoff	2018-10-01	68	-442/+779
\| \|\ \ \
\| * \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix error handling for missing auth_event	Richard van der Hoff	2018-09-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we were authorizing an event, if there was no `m.room.create` in its auth_events, we would raise a SynapseError with a cryptic message, which then meant that we would bail out of processing any incoming events, rather than storing a rejection for the faulty event and moving on. We should treat the absent event the same as any other auth failure, by raising an AuthError, so that the event is marked as rejected.
* \| \| \| \|	Disable frozen dicts by default (#3987)	Amber Brown	2018-10-02	4	-5/+18
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3990 from matrix-org/erikj/fix_logging_lost_connection	Erik Johnston	2018-10-02	2	-6/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix error when logging incomplete requests
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-10-02	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix error when logging incomplete requests	Erik Johnston	2018-10-02	1	-6/+21
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a connection is lost before a request is read from Request, Twisted sets `method` (and `uri`) attributes to dummy values. These dummy values have incorrect types (i.e. they're not bytes), and so things like `__repr__` would raise an exception. To fix this we had a helper method to return the method with a consistent type.
* \| \| \| \|	Merge pull request #3989 from matrix-org/rav/better_stacktraces	Richard van der Hoff	2018-10-02	3	-22/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Avoid reraise, to improve stacktraces
\| * \| \| \| \|	Avoid reraise, to improve stacktraces	Richard van der Hoff	2018-10-01	3	-22/+24
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #3986 from matrix-org/erikj/fix_sync_with_redacted_state	Erik Johnston	2018-10-02	2	-2/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Fix lazy loaded sync with rejected state events
\| * \| \| \|	Newsfile	Erik Johnston	2018-10-01	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Fix lazy loaded sync with rejected state events	Erik Johnston	2018-10-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In particular, we assume that the name and canonical alias events in the state have not been rejected. In practice this may not be the case (though we should probably think about fixing that) so lets ensure that we gracefully handle that case, rather than 404'ing the sync request like we do now.
* \| \| \| \|	Update instructions to point to pip install (#3985)	Amber Brown	2018-10-02	4	-61/+29
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3968 from matrix-org/rav/fix_federation_errors	Richard van der Hoff	2018-10-01	3	-118/+47
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix exceptions when handling incoming transactions
\| * \ \ \ \	Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors	Richard van der Hoff	2018-09-27	31	-38/+117
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Remove redundant, failing, test	Richard van der Hoff	2018-09-27	1	-106/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This test didn't do what it claimed to do, and what it claimed to do was the same as test_cant_hide_direct_ancestors anyway. This stuff is tested by sytest anyway.
\| * \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-27	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Include event when resolving state for missing prevs	Richard van der Hoff	2018-09-27	1	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we have a forward extremity for a room as `E`, and you receive `A`, `B`, s.t. `A -> B -> E`, and `B` also points to an unknown event `X`, then we need to do state res between `X` and `E`. When that happens, we need to make sure we include `X` in the state that goes into the state res alg. Fixes #3934.
\| * \| \| \| \| \|	Include state from remote servers in pdu handling	Richard van der Hoff	2018-09-27	1	-4/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we've fetched state events from remote servers in order to resolve the state for a new event, we need to actually pass those events into resolve_events_with_factory (so that it can do the state res) and then persist the ones we need - otherwise other bits of the codebase get confused about why we have state groups pointing to non-existent events.
\| * \| \| \| \| \|	Fix "unhashable type: 'list'" exception in federation handling	Richard van der Hoff	2018-09-27	1	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	get_state_groups returns a map from state_group_id to a list of FrozenEvents, so was very much the wrong thing to be putting as one of the entries in the list passed to resolve_events_with_factory (which expects maps from (event_type, state_key) to event id). We actually want get_state_groups_ids().values() rather than get_state_groups(). This fixes the main problem in #3923, but there are other problems with this bit of code which get discovered once you do so.
* \| \| \| \| \| \|	Fix userconsent on Python 3 (#3938)	Amber Brown	2018-10-02	6	-96/+240
\| \|_\|/ / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3933 from matrix-org/erikj/destination_retry_cache	Erik Johnston	2018-10-01	3	-3/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a five minute cache to get_destination_retry_timings
\| * \| \| \| \| \|	Correctly match 'dict.pop' api	Erik Johnston	2018-10-01	1	-3/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't update eviction metrics on explicit removal	Erik Johnston	2018-10-01	1	-5/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache	Richard van der Hoff	2018-09-28	51	-426/+696
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache	Richard van der Hoff	2018-09-26	6	-187/+440
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache	Richard van der Hoff	2018-09-25	51	-62/+128
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix ExpiringCache.__len__ to be accurate	Erik Johnston	2018-09-21	1	-12/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It used to try and produce an estimate, which was sometimes negative. This caused metrics to be sad, so lets always just calculate it from scratch.
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-21	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add a five minute cache to get_destination_retry_timings	Erik Johnston	2018-09-21	2	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hopefully helps with #3931
\| * \| \| \| \| \| \| \|	Make ExpiringCache slightly more performant	Erik Johnston	2018-09-21	1	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Further reduce the size of the docker image (#3972)	Richard van der Hoff	2018-10-01	2	-25/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite the dockerfile as a multistage build: this means we can get rid of a whole load of cruft which we don't need.
* \| \| \| \| \| \| \| \|	add --no-admin flag to registration script (#3836)	Bruno Windels	2018-09-28	2	-4/+15
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #3964 from matrix-org/rav/remove_localhost_checks	Richard van der Hoff	2018-09-28	3	-30/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove spurious federation checks on localhost
\| * \| \| \| \| \| \| \| \|	Fix complete fail to do the right thing	Richard van der Hoff	2018-09-28	2	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	remove spurious federation checks on localhost	Richard van der Hoff	2018-09-26	1	-31/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's really no point in checking for destinations called "localhost" because there is nothing stopping people creating other DNS entries which point to 127.0.0.1. The right fix for this is https://github.com/matrix-org/synapse/issues/3953. Blocking localhost, on the other hand, means that you get a surprise when trying to connect a test server on localhost to an existing server (with a 'normal' server_name).
* \| \| \| \| \| \| \| \| \|	Merge pull request #3980 from matrix-org/rav/remove_broken_cache_call	Richard van der Hoff	2018-09-28	2	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant call to start_get_pdu_cache
\| * \| \| \| \| \| \| \| \| \|	Remove redundant call to start_get_pdu_cache	Richard van der Hoff	2018-09-28	2	-1/+1
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I think this got forgotten in #3932. We were getting away with it because it was the last call in this function.
* / \| \| \| \| \| \| \| \|	build python 3 docker images on circle CI (#3976)	Jan Christian Grünhage	2018-09-28	2	-5/+12
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #3794 from matrix-org/erikj/faster_typing	Richard van der Hoff	2018-09-27	2	-3/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of getting typing updates for replication
\| * \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/faster_typing	Erik Johnston	2018-09-19	177	-1345/+2545
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Improve performance of getting typing updates for replication	Erik Johnston	2018-09-05	1	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetching the list of all new typing notifications involved iterating over all rooms and comparing their serial. Lets move to using a stream change cache, like we do for other streams.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3946 from matrix-org/michaelkaye/automate_docker_hub_upload	Richard van der Hoff	2018-09-27	2	-0/+27
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build and push docker image to hub automatically
\| * \| \| \| \| \| \| \| \| \| \|	Do the changelog.d dance	Michael Kaye	2018-09-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make a ":latest" tag, and a SHA1 commit ID one too.	Michael Kaye	2018-09-27	1	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Latest is horrible and makes debugging what has happened anywhere a nightmare. We push a latest because of demand for it, but we'll also push a SHA1 commit id so those wanting to know what they're running (and be able to roll back if required) can use those instead. Note that latest here is defined as "most recent master commit" not "most recent released version", as the actual semantics of making latest correct while still being able to build bugfixed releases of previous versions is just ARGH. So we define it as "master" not "latest release".
\| * \| \| \| \| \| \| \| \| \| \|	Also, don't run this job on any branches	Michael Kaye	2018-09-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make username configurable in the UI too	Michael Kaye	2018-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix typo	Michael Kaye	2018-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Build and push docker image to hub	Michael Kaye	2018-09-27	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3967 from matrix-org/rav/federation_handler_cleanups	Richard van der Hoff	2018-09-27	3	-4/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Clarifications in FederationHandler
\| * \| \| \| \| \| \| \| \| \| \|	more comments	Richard van der Hoff	2018-09-27	2	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Clarifications in FederationHandler	Richard van der Hoff	2018-09-27	1	-2/+11
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add some comments on things that look a bit bogus * rename this `state` variable to avoid confusion with the `state` used elsewhere in this function. (There was no actual conflict, but it was a confusing bit of spaghetti.)
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3965 from matrix-org/rav/notify_app_services_bg_process	Amber Brown	2018-09-27	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run notify_app_services as a bg process
\| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Run notify_app_services as a bg process	Richard van der Hoff	2018-09-26	1	-2/+6
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that its resource usage metrics get recorded somewhere rather than getting lost. (It also fixes an error when called from a nested logging context which completes before the bg process)
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3970 from schnuffle/develop-py3	Amber Brown	2018-09-27	19	-19/+20
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced all occurences of e.message with str(e)
\| * \| \| \| \| \| \| \| \| \| \|	Update 3970.bugfix	Amber Brown	2018-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Added changelog fragment	Schnuffle	2018-09-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Replaced all occurences of e.message with str(e)	Schnuffle	2018-09-27	18	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Schnuffle <schnuffle@github.com>
* \| \| \| \| \| \| \| \| \| \| \|	Run our oldest supported configuration in CI (#3952)	Amber Brown	2018-09-27	4	-13/+38
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3961 from matrix-org/neilj/lock_mau_upserts	Richard van der Hoff	2018-09-27	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	fix #3854 MAU transaction errors
\| * \| \| \| \| \| \| \| \| \| \|	towncrier	Neil Johnson	2018-09-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix #3854	Neil Johnson	2018-09-26	1	-1/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3966 from matrix-org/rav/rx_txn_logging_2	Richard van der Hoff	2018-09-27	3	-2/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logging improvements
\| * \| \| \| \| \| \| \| \| \| \|	Logging improvements	Richard van der Hoff	2018-09-26	3	-2/+17
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some logging tweaks to help with debugging incoming federation transactions
* \| \| \| \| \| \| \| \| \| \|	Include eventid in log lines when processing incoming federation ↵	Richard van der Hoff	2018-09-27	6	-57/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	transactions (#3959) when processing incoming transactions, it can be hard to see what's going on, because we process a bunch of stuff in parallel, and because we may end up recursively working our way through a chain of three or four events. This commit creates a way to use logcontexts to add the relevant event ids to the log lines.
* \| \| \| \| \| \| \| \| \| \|	docstrings and unittests for storage.state (#3958)	Richard van der Hoff	2018-09-27	3	-8/+62
\| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I spent ages trying to figure out how I was going mad...
* \| \| \| \| \| \| \| \| \|	Merge pull request #3963 from matrix-org/rav/get_state_for_room_docstring	Amber Brown	2018-09-27	2	-4/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	fix docstring for FederationClient.get_state_for_room
\| * \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix docstring for FederationClient.get_state_for_room	Richard van der Hoff	2018-09-26	1	-4/+4
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	trivial fixes for docstring
* / / / / / / / /	Reduce the load on our CI (#3957)	Amber Brown	2018-09-27	3	-8/+30
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* changelog * reduce circleci config * plus a handy script * fix regex
* \| \| \| \| \| \| \|	Merge branch 'develop' into rav/hacky_cache_factor_fix	Richard van der Hoff	2018-09-26	6	-315/+320
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge pull request #3956 from matrix-org/rav/fix_expiring_cache_len	Richard van der Hoff	2018-09-26	3	-20/+25
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|	Fix ExpiringCache.__len__ to be accurate
\| \| * \| \| \| \| \| \|	Log which cache is throwing exceptions	Richard van der Hoff	2018-09-26	1	-10/+17
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-26	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix ExpiringCache.__len__ to be accurate	Erik Johnston	2018-09-26	1	-10/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It used to try and produce an estimate, which was sometimes negative. This caused metrics to be sad, so lets always just calculate it from scratch. (This appears to have been a longstanding bug, but one which has been made more of a problem by #3932 and #3933). (This was originally done by Erik as part of #3933. I'm cherry-picking it because really it's a fix in its own right)
\| * \| \| \| \| \| \| \|	Merge pull request #3948 from matrix-org/rav/no_symlink_synctl	Amber Brown	2018-09-26	3	-285/+285
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move synctl into top dir to avoid a symlink
\| \| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Move synctl into top dir to avoid a symlink	Richard van der Hoff	2018-09-25	2	-285/+284
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	symlinks apparently break setuptools on python3 and alpine (https://bugs.python.org/issue31940), so let's stop using a symlink and just use the file directly.
* \| \| \| \| \| \| \| \| \|	Actuall set cache factors in workers	Erik Johnston	2018-09-26	1	-5/+15
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #3924 from matrix-org/rav/clean_up_on_receive_pdu	Amber Brown	2018-09-26	3	-24/+48
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Comments and interface cleanup for on_receive_pdu
\| * \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-20	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Comments and interface cleanup for on_receive_pdu	Richard van der Hoff	2018-09-20	2	-24/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some informative comments about what's going on here. Also, `sent_to_us_directly` and `get_missing` were doing the same thing (apart from in `_handle_queued_pdus`, which looks like a bug), so let's get rid of `get_missing` and use `sent_to_us_directly` consistently.
* \| \| \| \| \| \| \| \|	Merge pull request #3911 from matrix-org/jcgruenhage/docker-support-python3	Richard van der Hoff	2018-09-25	3	-2/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make python 3 work in the docker container
\| * \| \| \| \| \| \| \| \|	Update Dockerfile	Jan Christian Grünhage	2018-09-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update .dockerignore	Jan Christian Grünhage	2018-09-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add changelog	Jan Christian Grünhage	2018-09-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	make python 3 work in the docker container	Jan Christian Grünhage	2018-09-20	3	-2/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Update grafana dashboard	Richard van der Hoff	2018-09-25	1	-175/+417
\| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #3932 from matrix-org/erikj/auto_start_expiring_caches	Richard van der Hoff	2018-09-25	17	-39/+13
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|	Fix some instances of ExpiringCache not expiring cache items
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-21	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix some instances of ExpiringCache not expiring cache items	Erik Johnston	2018-09-21	16	-39/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ExpiringCache required that `start()` be called before it would actually start expiring entries. A number of places didn't do that. This PR removes `start` from ExpiringCache, and automatically starts backround reaping process on creation instead.
* \| \| \| \| \| \| \| \|	added "media-src: 'self'" to CSP for resources (#3578)	Jérémy Farnaud	2018-09-25	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse doesn’t allow for media resources to be played directly from Chrome. It is a problem for users on other networks (e.g. IRC) communicating with Matrix users through a gateway. The gateway sends them the raw URL for the resource when a Matrix user uploads a video and the video cannot be played directly in Chrome using that URL. Chrome argues it is not authorized to play the video because of the Content Security Policy. Chrome checks for the "media-src" policy which is missing, and defauts to the "default-src" policy which is "none". As Synapse already sends "object-src: 'self'" I thought it wouldn’t be a problem to add "media-src: 'self'" to the CSP to fix this problem.
* \| \| \| \| \| \| \| \|	Merge pull request #3925 from matrix-org/erikj/fix_producers_unregistered	Richard van der Hoff	2018-09-25	2	-14/+36
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spurious exceptions when client closes conncetion
\| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix spurious exceptions when client closes conncetion	Erik Johnston	2018-09-20	1	-14/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a HTTP handler throws an exception while processing a request we automatically write a JSON error response. If the handler had already started writing a response twisted throws an exception. We should check for this case and simple abort the connection if there was an error after the response had started being written.
* \| \| \| \| \| \| \| \| \|	Merge pull request #3947 from matrix-org/rav/attr_version	Richard van der Hoff	2018-09-25	2	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|	We require attrs 16.0.0
\| * \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	We require attrs 16.0.0	Richard van der Hoff	2018-09-25	1	-1/+3
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ref: https://github.com/matrix-org/synapse/issues/3945
* \| \| \| \| \| \| \| \|	Only lazy load self-members on initial sync	Matthew Hodgson	2018-09-25	2	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given we have disabled lazy loading for incr syncs in #3840, we can make self-LL more efficient by only doing it on initial sync. Also adds a bounds check for if/when we change our mind, so that we don't try to include LL members on sync responses with no timeline.
* \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Amber Brown	2018-09-25	3	-3/+13
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge tag 'v0.33.5.1'	Amber Brown	2018-09-25	3	-3/+13
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internal Changes ---------------- - Fix incompatibility with older Twisted version in tests. Thanks @OlegGirko! ([\#3940](https://github.com/matrix-org/synapse/issues/3940))
\| \| * \| \| \| \| \| \| \| \|	changelog v0.33.5.1 github/release-v0.33.5.1 release-v0.33.5.1	Amber Brown	2018-09-25	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	bump version	Amber Brown	2018-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	changelog for 3940	Amber Brown	2018-09-25	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix compatibility issue with older Twisted in tests.	Oleg Girko	2018-09-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Older Twisted (18.4.0) returns TimeoutError instead of ConnectingCancelledError when connection times out. This change allows tests to be compatible with this behaviour. Signed-off-by: Oleg Girko <ol@infoserver.lv>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into develop	Amber Brown	2018-09-24	42	-40/+65
\|\\| \| \| \| \| \| \| \| \| \| \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge tag 'v0.33.5'	Amber Brown	2018-09-24	87	-1091/+1998
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Features -------- - Python 3.5 and 3.6 support is now in beta. ([\#3576](https://github.com/matrix-org/synapse/issues/3576)) - Implement `event_format` filter param in `/sync` ([\#3790](https://github.com/matrix-org/synapse/issues/3790)) - Add synapse_admin_mau:registered_reserved_users metric to expose number of real reaserved users ([\#3846](https://github.com/matrix-org/synapse/issues/3846)) Bugfixes -------- - Remove connection ID for replication prometheus metrics, as it creates a large number of new series. ([\#3788](https://github.com/matrix-org/synapse/issues/3788)) - guest users should not be part of mau total ([\#3800](https://github.com/matrix-org/synapse/issues/3800)) - Bump dependency on pyopenssl 16.x, to avoid incompatibility with recent Twisted. ([\#3804](https://github.com/matrix-org/synapse/issues/3804)) - Fix existing room tags not coming down sync when joining a room ([\#3810](https://github.com/matrix-org/synapse/issues/3810)) - Fix jwt import check ([\#3824](https://github.com/matrix-org/synapse/issues/3824)) - fix VOIP crashes under Python 3 (#3821) ([\#3835](https://github.com/matrix-org/synapse/issues/3835)) - Fix manhole so that it works with latest openssh clients ([\#3841](https://github.com/matrix-org/synapse/issues/3841)) - Fix outbound requests occasionally wedging, which can result in federation breaking between servers. ([\#3845](https://github.com/matrix-org/synapse/issues/3845)) - Show heroes if room name/canonical alias has been deleted ([\#3851](https://github.com/matrix-org/synapse/issues/3851)) - Fix handling of redacted events from federation ([\#3859](https://github.com/matrix-org/synapse/issues/3859)) - ([\#3874](https://github.com/matrix-org/synapse/issues/3874)) - Mitigate outbound federation randomly becoming wedged ([\#3875](https://github.com/matrix-org/synapse/issues/3875)) Internal Changes ---------------- - CircleCI tests now run on the potential merge of a PR. ([\#3704](https://github.com/matrix-org/synapse/issues/3704)) - http/ is now ported to Python 3. ([\#3771](https://github.com/matrix-org/synapse/issues/3771)) - Improve human readable error messages for threepid registration/account update ([\#3789](https://github.com/matrix-org/synapse/issues/3789)) - Make /sync slightly faster by avoiding needless copies ([\#3795](https://github.com/matrix-org/synapse/issues/3795)) - handlers/ is now ported to Python 3. ([\#3803](https://github.com/matrix-org/synapse/issues/3803)) - Limit the number of PDUs/EDUs per federation transaction ([\#3805](https://github.com/matrix-org/synapse/issues/3805)) - Only start postgres instance for postgres tests on Travis CI ([\#3806](https://github.com/matrix-org/synapse/issues/3806)) - tests/ is now ported to Python 3. ([\#3808](https://github.com/matrix-org/synapse/issues/3808)) - crypto/ is now ported to Python 3. ([\#3822](https://github.com/matrix-org/synapse/issues/3822)) - rest/ is now ported to Python 3. ([\#3823](https://github.com/matrix-org/synapse/issues/3823)) - add some logging for the keyring queue ([\#3826](https://github.com/matrix-org/synapse/issues/3826)) - speed up lazy loading by 2-3x ([\#3827](https://github.com/matrix-org/synapse/issues/3827)) - Improved Dockerfile to remove build requirements after building reducing the image size. ([\#3834](https://github.com/matrix-org/synapse/issues/3834)) - Disable lazy loading for incremental syncs for now ([\#3840](https://github.com/matrix-org/synapse/issues/3840)) - federation/ is now ported to Python 3. ([\#3847](https://github.com/matrix-org/synapse/issues/3847)) - Log when we retry outbound requests ([\#3853](https://github.com/matrix-org/synapse/issues/3853)) - Removed some excess logging messages. ([\#3855](https://github.com/matrix-org/synapse/issues/3855)) - Speed up purge history for rooms that have been previously purged ([\#3856](https://github.com/matrix-org/synapse/issues/3856)) - Refactor some HTTP timeout code. ([\#3857](https://github.com/matrix-org/synapse/issues/3857)) - Fix running merged builds on CircleCI ([\#3858](https://github.com/matrix-org/synapse/issues/3858)) - Fix typo in replication stream exception. ([\#3860](https://github.com/matrix-org/synapse/issues/3860)) - Add in flight real time metrics for Measure blocks ([\#3871](https://github.com/matrix-org/synapse/issues/3871)) - Disable buffering and automatic retrying in treq requests to prevent timeouts. ([\#3872](https://github.com/matrix-org/synapse/issues/3872)) - mention jemalloc in the README ([\#3877](https://github.com/matrix-org/synapse/issues/3877)) - Remove unmaintained "nuke-room-from-db.sh" script ([\#3888](https://github.com/matrix-org/synapse/issues/3888))
\| \| * \| \| \| \| \| \| \|	towncrier v0.33.5 github/release-v0.33.5 release-v0.33.5	Amber Brown	2018-09-24	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	update version	Amber Brown	2018-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	changelog v0.33.5rc1	Amber Brown	2018-09-17	41	-39/+58
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	update python 3 changelog	Amber Brown	2018-09-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	version	Amber Brown	2018-09-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #3927 from matrix-org/erikj/handle_background_errors	Erik Johnston	2018-09-21	2	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle exceptions thrown by background tasks
\| * \| \| \| \| \| \| \| \| \|	Add missing logger	Erik Johnston	2018-09-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Handle exceptions thrown by background tasks	Erik Johnston	2018-09-20	1	-0/+2
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3921
* \| \| \| \| \| \| \| \| \|	Always LL ourselves if we're in a room to simplify clients (#3916)	Matthew Hodgson	2018-09-20	2	-0/+5
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Should fix https://github.com/vector-im/riot-web/issues/7209
* \| \| \| \| \| \| \| \|	Merge pull request #3868 from matrix-org/neilj/fix_room_invite_mail_links	Neil Johnson	2018-09-20	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|	Neilj/fix room invite mail links
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/develop' into ↵	Richard van der Hoff	2018-09-18	31	-98/+351
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	neilj/fix_room_invite_mail_links
\| * \| \| \| \| \| \| \| \|	towncrier	Neil Johnson	2018-09-13	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix link for case that config.email_riot_base_url is set	Neil Johnson	2018-09-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix client IPs being broken on Python 3 (#3908)	Amber Brown	2018-09-20	9	-58/+238
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #3914 from matrix-org/erikj/remove_retry_cache	Erik Johnston	2018-09-20	2	-8/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove get_destination_retry_timings cache
\| * \| \| \| \| \| \| \| \|	Fix up changelog and remove spurious comment	Erik Johnston	2018-09-19	2	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	pep8	Erik Johnston	2018-09-19	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove get_destination_retry_timings cache	Erik Johnston	2018-09-19	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we rely on the master to invalidate this cache promptly. However, after having moved most federation endpoints off of master this no longer happens, causing outbound fedeariont to get blackholed. Fixes #3798
* \| \| \| \| \| \| \| \| \|	Add a way to run tests in PostgreSQL in Docker (#3699)	Amber Brown	2018-09-20	8	-9/+79
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Add a regression test for logging on failed connections (#3912)	Amber Brown	2018-09-20	4	-5/+77
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Improve the logging when handling a federation transaction (#3904)	Richard van der Hoff	2018-09-19	3	-56/+111
\| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let's try to rationalise the logging that happens when we are processing an incoming transaction, to make it easier to figure out what is going wrong when they take ages. In particular: - make everything start with a [room_id event_id] prefix - make sure we log a warning when catching exceptions rather than just turning them into other, more cryptic, exceptions.
* \| \| \| \| \| \| \| \|	Merge pull request #3910 from matrix-org/erikj/update_timeout	Erik Johnston	2018-09-19	5	-87/+52
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Update to use new timeout function everywhere.
\| * \| \| \| \| \| \| \|	Fixup	Erik Johnston	2018-09-19	2	-4/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Replace custom DeferredTimeoutError with defer.TimeoutError	Erik Johnston	2018-09-19	2	-12/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Run canceller first to allow it to generate correct error	Erik Johnston	2018-09-19	1	-2/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-19	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update to use new timeout function everywhere.	Erik Johnston	2018-09-19	4	-72/+43
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The existing deferred timeout helper function (and the one into twisted) suffer from a bug when a deferred's canceller throws an exception, #3842. The new helper function doesn't suffer from this problem.
* \| \| \| \| \| \| \|	update changelog for #3909	Richard van der Hoff	2018-09-19	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3909 from turt2live/travis/fix-logging-1	Amber Brown	2018-09-19	2	-4/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix matrixfederationclient.py logging: Destination is a string