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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #3860 from matrix-org/travis/typo-1	Travis Ralston	2018-09-13	2	-1/+2
\|\ \| \| \| \|	Fix minor typo in exception
\| *	Create 3860.misc	Travis Ralston	2018-09-13	1	-0/+1
\| \|
\| *	Fix minor typo in exception	Travis Ralston	2018-09-13	1	-1/+1
\|/
*	merge (#3576)	Amber Brown	2018-09-14	8	-61/+55
\|
*	Merge pull request #3856 from matrix-org/erikj/speed_up_purge hhs-8	Erik Johnston	2018-09-13	2	-16/+29
\|\ \| \| \| \|	Make purge history slightly faster
\| *	comment	Erik Johnston	2018-09-13	1	-0/+2
\| \|
\| *	pep8	Erik Johnston	2018-09-13	1	-1/+0
\| \|
\| *	Create indices after insertion	Erik Johnston	2018-09-13	1	-14/+18
\| \|
\| *	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-09-13	4	-2/+28
\| \|\ \| \| \| \| \| \| \| \| \|	erikj/speed_up_purge
\| * \|	Newsfile	Erik Johnston	2018-09-13	1	-0/+1
\| \| \|
\| * \|	Make purge history slightly faster	Erik Johnston	2018-09-13	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't pull out events that are outliers and won't be deleted, as nothing should happen to them.
* \| \|	Merge pull request #3859 from matrix-org/erikj/add_iterkeys	Amber Brown	2018-09-14	3	-1/+7
\|\ \ \ \| \| \| \| \| \| \| \|	Fix handling of redacted events from federation
\| * \| \|	Newsfile	Erik Johnston	2018-09-13	1	-0/+1
\| \| \| \|
\| * \| \|	Fix handling of redacted events from federation	Erik Johnston	2018-09-13	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If we receive an event that doesn't pass their content hash check (e.g. due to already being redacted) then we hit a bug which causes an exception to be raised, which then promplty stops the event (and request) from being processed. This effects all sorts of federation APIs, including joining rooms with a redacted state event.
* \| \| \|	fix circleci merged builds (#3858)	Amber Brown	2018-09-14	2	-0/+5
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* fix * changelog
* \| /	Attempt to figure out what's going on with timeouts (#3857)	Amber Brown	2018-09-14	4	-57/+241
\| \|/ \|/\|
* \|	Remove some superfluous logging (#3855)	Amber Brown	2018-09-13	4	-2/+28
\|/
*	Merge pull request #3846 from matrix-org/neilj/expose-registered-users hhs-7	Neil Johnson	2018-09-12	4	-3/+60
\|\ \| \| \| \|	expose number of real reserved users
\| *	improve naming	Neil Johnson	2018-09-12	4	-10/+14
\| \|
\| *	towncrier	Neil Johnson	2018-09-12	1	-0/+1
\| \|
\| *	expose number of real reserved users	Neil Johnson	2018-09-12	3	-3/+55
\| \|
* \|	show heroes if a room has a 'deleted' name/canonical_alias (#3851)	Matthew Hodgson	2018-09-12	2	-2/+16
\| \|
* \|	Merge pull request #3853 from matrix-org/erikj/log_outbound_each_time	Erik Johnston	2018-09-12	2	-75/+75
\|\ \ \| \| \| \| \| \|	Log outbound requests when we retry
\| * \|	Newsfile	Erik Johnston	2018-09-12	1	-0/+1
\| \| \|
\| * \|	Log outbound requests when we retry	Erik Johnston	2018-09-12	1	-75/+74
\| \| \|
* \| \|	argh pep8	Matthew Hodgson	2018-09-12	1	-1/+1
\| \| \|
* \| \|	correctly log gappy sync metrics	Matthew Hodgson	2018-09-12	1	-1/+1
\| \| \|
* \| \|	fix logline	Matthew Hodgson	2018-09-12	1	-1/+1
\| \| \|
* \| \|	Merge pull request #3841 from matrix-org/erikj/manhole_key_length	Erik Johnston	2018-09-12	2	-13/+32
\|\ \ \ \| \| \| \| \| \| \| \|	Change the manhole SSH key to have more bits
\| * \| \|	Newsfile	Erik Johnston	2018-09-11	1	-0/+1
\| \| \| \|
\| * \| \|	Change the manhole SSH key to have more bits	Erik Johnston	2018-09-11	1	-13/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Newer versions of openssh client refuse to connect to the old key due to its length.
* \| \| \|	Add JUnit summaries to CircleCI as well as merged runs (#3704)	Amber Brown	2018-09-12	3	-0/+94
\| \| \| \|
* \| \| \|	Port federation/ to py3 (#3847)	Amber Brown	2018-09-12	4	-19/+19
\| \| \| \|
* \| \| \|	Merge pull request #3835 from krombel/fix_3821	Amber Brown	2018-09-12	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	fix VOIP crashes under Python 3
\| * \| \| \|	add changelog	Krombel	2018-09-10	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	fix VOIP crashes under Python 3 (#3821)	Krombel	2018-09-10	1	-1/+5
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3826 from matrix-org/rav/logging_for_keyring	Amber Brown	2018-09-12	4	-13/+47
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	add some logging for the keyring queue
\| * \| \| \| \|	changelog	Richard van der Hoff	2018-09-07	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	clearer logging when things fail, too	Richard van der Hoff	2018-09-06	2	-7/+28
\| \| \| \| \| \|
\| * \| \| \| \|	add some logging for the keyring queue	Richard van der Hoff	2018-09-06	1	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	why is it so damn slow?
* \| \| \| \| \|	Merge pull request #3824 from matrix-org/rav/fix_jwt_import	Amber Brown	2018-09-12	3	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix jwt import check
\| * \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-07	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix jwt import check	Richard van der Hoff	2018-09-07	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This handy code attempted to check that we could import jwt, but utterly failed to check it was the right jwt. Fixes https://github.com/matrix-org/synapse/issues/3793
* \| \| \| \| \| \|	Port rest/ to Python 3 (#3823)	Amber Brown	2018-09-12	18	-100/+113
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Port crypto/ to Python 3 (#3822)	Amber Brown	2018-09-12	4	-6/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3845 from matrix-org/erikj/timeout_reads	Amber Brown	2018-09-12	2	-7/+46
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	Timeout reading body for outbound HTTP requests
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-09-12	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Timeout reading body for outbound HTTP requests	Erik Johnston	2018-09-12	1	-7/+45
\|/ / / / /
* \| \| \| /	Speed up lazy loading (#3827)	Matthew Hodgson	2018-09-12	5	-30/+159
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* speed up room summaries by pulling their data from room_memberships rather than room state * disable LL for incr syncs, and log incr sync stats (#3840)
* \| \| \|	Merge pull request #3834 from mvgorcum/develop	Erik Johnston	2018-09-10	2	-10/+17
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Remove build requirements after building docker image
\| * \| \|	add runtime dependencies	Jan Christian Grünhage	2018-09-10	1	-5/+10
\| \| \| \|
\| * \| \|	Newsfile	Mathijs van Gorcum	2018-09-10	1	-0/+1
\| \| \| \|
\| * \| \|	Move COPY before RUN and merge RUNs	Mathijs van Gorcum	2018-09-10	1	-5/+5
\| \| \| \|
\| * \| \|	Remove build requirements after building	Mathijs van Gorcum	2018-09-10	1	-2/+3
\|/ / /
* \| \|	Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join	Amber Brown	2018-09-07	2	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \|	Send existing room tags down sync on join
\| * \| \|	Newsfile	Erik Johnston	2018-09-06	1	-0/+1
\| \| \| \|
\| * \| \|	Don't send empty tags list down sync	Erik Johnston	2018-09-06	1	-0/+5
\| \| \| \|
\| * \| \|	Send existing room tags down sync on join	Erik Johnston	2018-09-06	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a user joined a room any existing tags were not sent down the sync stream. Ordinarily this isn't a problem because the user needs to be in the room to have set tags in it, however synapse will sometimes add tags for a user to a room, e.g. for server notices, which need to come down sync.
* \| \| \|	Merge pull request #3783 from cwmke/develop	Richard van der Hoff	2018-09-07	1	-0/+12
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Add apache vhost config to Readme
\| * \| \|	Remove end '/'s	Colin W	2018-09-02	1	-2/+2
\| \| \| \|
\| * \| \|	Update readme on develop branch	Colin W	2018-09-02	1	-0/+12
\| \| \| \|
* \| \| \|	Merge branch 'master' into develop	Amber Brown	2018-09-07	29	-28/+61
\|\ \ \ \
\| * \| \| \|	changelog v0.33.4 release-v0.33.4	Amber Brown	2018-09-07	2	-1/+9
\| \| \| \| \|
\| * \| \| \|	version	Amber Brown	2018-09-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into release-v0.33.4 v0.33.4rc2	Erik Johnston	2018-09-06	0	-0/+0
\| \|\ \ \ \
\| * \| \| \| \|	Bump version and changelog	Erik Johnston	2018-09-06	2	-1/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Merge tag 'v0.33.3.1' into release-v0.33.4	Erik Johnston	2018-09-06	7	-46/+158
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse 0.33.3.1 (2018-09-06) ============================= SECURITY FIXES -------------- - Fix an issue where event signatures were not always correctly validated ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) - Fix an issue where server_acls could be circumvented for incoming events ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) Internal Changes ---------------- - Unignore synctl in .dockerignore to fix docker builds ([\#3802](https://github.com/matrix-org/synapse/issues/3802))
\| * \ \ \ \ \	Merge pull request #3802 from matrix-org/jcgruenhage/docker-unignore-synctl	Amber Brown	2018-09-06	2	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove synctl from .dockerignore
\| \| * \| \| \| \| \|	Create 3802.misc	Jan Christian Grünhage	2018-09-06	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	remove synctl from .dockerignore	Jan Christian Grünhage	2018-09-06	1	-1/+0
\| \|/ / / / / /
\| * \| \| \| \| \|	version and towncrier v0.33.4rc1	Amber Brown	2018-09-04	29	-28/+45
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Port tests/ to Python 3 (#3808)	Amber Brown	2018-09-07	12	-430/+349
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3800 from matrix-org/neilj/remove-guests-from-mau-count hhs-6	Neil Johnson	2018-09-06	5	-6/+54
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	guest users should not be part of mau total
\| * \| \| \| \| \|	ensure guests never enter mau list	Neil Johnson	2018-09-06	4	-8/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	towncrier	Neil Johnson	2018-09-05	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	guest users should not be part of mau total	Neil Johnson	2018-09-05	2	-3/+48
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3805 from matrix-org/erikj/limit_transaction_pdus_edus	Amber Brown	2018-09-07	2	-0/+13
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit the number of PDUs/EDUs per fedreation transaction
\| * \| \| \| \| \| \|	Spelling	Erik Johnston	2018-09-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-06	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Limit the number of PDUs/EDUs per fedreation transaction	Erik Johnston	2018-09-06	1	-0/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis	Amber Brown	2018-09-07	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only start postgres instance for postgres tests on Travis CI
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-06	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Only start postgres instance for postgres tests on Travis CI	Erik Johnston	2018-09-06	1	-3/+2
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #3788 from matrix-org/erikj/remove_conn_id	Amber Brown	2018-09-07	2	-12/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove conn_id from repl prometheus metrics
\| * \| \| \| \| \| \| \|	Remove conn_id	Erik Johnston	2018-09-04	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-03	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove conn_id from repl prometheus metrics	Erik Johnston	2018-09-03	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`conn_id` gets set to a random string, and so we end up filling up prometheus with tonnes of data series, which is bad.
* \| \| \| \| \| \| \| \|	Merge pull request #3795 from matrix-org/erikj/faster_sync_state	Amber Brown	2018-09-07	2	-8/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	User iter* during sync state calculations
\| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-09-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	User iter* during sync state calculations	Erik Johnston	2018-09-05	1	-8/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #3804 from matrix-org/rav/fix_openssl_dep	Amber Brown	2018-09-07	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	bump dep on pyopenssl to 16.x
\| * \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	bump dep on pyopenssl to 16.x	Richard van der Hoff	2018-09-06	1	-2/+2
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Port handlers/ to Python 3 (#3803)	Amber Brown	2018-09-07	8	-19/+24
\| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2018-09-06	9	-47/+157
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| / / \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge tag 'v0.33.3.1'	Richard van der Hoff	2018-09-06	9	-47/+157
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synapse 0.33.3.1 (2018-09-06) ============================= SECURITY FIXES -------------- - Fix an issue where event signatures were not always correctly validated ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) - Fix an issue where server_acls could be circumvented for incoming events ([\#3796](https://github.com/matrix-org/synapse/issues/3796)) Internal Changes ---------------- - Unignore synctl in .dockerignore to fix docker builds ([\#3802](https://github.com/matrix-org/synapse/issues/3802))
\| \| * \| \| \| \|	prepare v0.33.3.1 v0.33.3.1 release-v0.33.3.1	Richard van der Hoff	2018-09-06	3	-2/+15
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Create 3802.misc	Jan Christian Grünhage	2018-09-06	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	remove synctl from .dockerignore	Jan Christian Grünhage	2018-09-06	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix origin handling for pushed transactions	Richard van der Hoff	2018-09-05	5	-29/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the actual origin for push transactions, rather than whatever the remote server claimed.
\| \| * \| \| \| \|	Check that signatures on events are valid	Richard van der Hoff	2018-09-05	1	-16/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should check that both the sender's server, and the server which created the event_id (which may be different from whatever the remote server has told us the origin is), have signed the event.
* \| \| \| \| \| \|	Merge pull request #3790 from matrix-org/rav/respect_event_format_in_filter	Richard van der Hoff	2018-09-05	3	-13/+40
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement 'event_format' filter param in /sync
\| * \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-09-04	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Implement 'event_format' filter param in /sync	Richard van der Hoff	2018-09-04	2	-13/+39
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has been specced and part-implemented; let's implement it for /sync (but no other endpoints yet :/).
* \| \| \| \| \| \|	Port http/ to Python 3 (#3771)	Amber Brown	2018-09-06	8	-186/+134
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3789 from matrix-org/neilj/improve_threepid_error_strings hhs-5	Neil Johnson	2018-09-04	3	-7/+22
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	improve human readable error messages
\| * \| \| \| \|	towncrier	Neil Johnson	2018-09-04	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	improve human readable error message	Neil Johnson	2018-09-04	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	improve human readable error messages	Neil Johnson	2018-09-04	2	-7/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Fix tests on postgresql (#3740)	Amber Brown	2018-09-04	18	-341/+356
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #3737 from matrix-org/erikj/remove_redundant_state_func	Erik Johnston	2018-09-03	4	-57/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary resolve_events_with_state_map
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-09-03	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unnecessary resolve_events_with_state_map	Erik Johnston	2018-08-22	3	-57/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We only ever used the synchronous resolve_events_with_state_map in one place, which is trivial to replace with the async version.
* \| \| \| \| \|	Merge pull request #3378 from NickEckardt/develop	Amber Brown	2018-09-03	2	-5/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	matrix-synapse-auto-deploy is no longer maintained.
\| * \| \| \| \|	Create 3378.misc	Amber Brown	2018-09-03	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into develop	Amber Brown	2018-09-03	441	-11570/+24237
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3777 from matrix-org/neilj/fix_register_user_registration	Neil Johnson	2018-08-31	9	-5/+78
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|	fix bug where preserved threepid user comes to sign up and server is …
\| * \| \| \| \|	assert rather than warn hhs-4	Neil Johnson	2018-08-31	1	-3/+2
\| \| \| \| \| \|
\| * \| \| \| \|	move threepid checker to config, add missing yields	Neil Johnson	2018-08-31	6	-21/+41
\| \| \| \| \| \|
\| * \| \| \| \|	fix reference to is_threepid_reserved	Neil Johnson	2018-08-31	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	typo	Neil Johnson	2018-08-31	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	ensure post registration auth checks do not fail erroneously	Neil Johnson	2018-08-31	4	-6/+24
\| \| \| \| \| \|
\| * \| \| \| \|	news fragemnt	Neil Johnson	2018-08-31	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix bug where preserved threepid user comes to sign up and server is mau blocked	Neil Johnson	2018-08-31	5	-3/+38
\|/ / / / /
* \| \| \| \|	Port storage/ to Python 3 (#3725)	Amber Brown	2018-08-31	17	-36/+208
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3764 from matrix-org/rav/close_db_conn_after_init	Richard van der Hoff	2018-08-30	16	-54/+41
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make sure that we close db connections opened during init
\| * \| \| \| \|	Fix up tests	Richard van der Hoff	2018-08-28	3	-6/+10
\| \| \| \| \| \|
\| * \| \| \| \|	use abc.abstractproperty	Richard van der Hoff	2018-08-28	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gives clearer messages when someone gets it wrong
\| * \| \| \| \|	changelog	Richard van der Hoff	2018-08-28	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Make sure that we close db connections opened during init	Richard van der Hoff	2018-08-28	12	-48/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should explicitly close any db connections we open, because failing to do so can block other transactions as per https://github.com/matrix-org/synapse/issues/3682. Let's also try to factor out some of the boilerplate by having server classes define their datastore class rather than duplicating the whole of `setup`.
* \| \| \| \| \|	Merge pull request #3768 from krombel/fix_3445	Erik Johnston	2018-08-29	2	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #3445 - do not use itervalues() on SortedDict()
\| * \| \| \| \| \|	changelog	Krombel	2018-08-29	2	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix #3445	Krombel	2018-08-29	2	-2/+3
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	itervalues(d) calls d.itervalues() [PY2] and d.values() [PY3] but SortedDict only implements d.values()
* \| \| \| \| \|	Update CONTRIBUTING to clarify miscs & Markdown (#3730)	Amber Brown	2018-08-29	2	-3/+5
\| \| \| \| \| \|
* \| \| \| \| \|	don't return non-LL-member state in incremental sync state blocks (#3760)	Matthew Hodgson	2018-08-28	2	-1/+9
\|/ / / / / \| \| \| \| \| \| \| \| \| \|	don't return non-LL-member state in incremental sync state blocks
* \| \| \| \|	Merge pull request #3758 from matrix-org/erikj/admin_contact hhs-3	Erik Johnston	2018-08-24	8	-13/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Change admin_uri to admin_contact in config and errors
\| * \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact	Erik Johnston	2018-08-24	3	-4/+5
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3756 from matrix-org/erikj/fix_tags_server_notices	Erik Johnston	2018-08-24	3	-4/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix checking if service notice room is already tagged
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix checking if service notice room is already tagged	Erik Johnston	2018-08-24	2	-4/+4
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This manifested in synapse repeatedly setting the tag for the room
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Change admin_uri to admin_contact in config and errors	Erik Johnston	2018-08-24	7	-13/+13
\|/ / / / /
* \| \| \| \|	Merge pull request #3755 from matrix-org/erikj/fix_server_notice_tags hhs-2	Erik Johnston	2018-08-24	3	-4/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix up tagging server notice rooms.
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Ensure we wake up /sync when we add tag to notice room	Erik Johnston	2018-08-24	2	-2/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Make content of tag an empty object rather than null	Erik Johnston	2018-08-24	2	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #3754 from matrix-org/erikj/fix_whitelist hhs-1	Erik Johnston	2018-08-24	2	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Allow federation_domain_whitelist to be emtpy list
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix bug when federation_domain_whitelist is an emtpy list	Erik Johnston	2018-08-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Outbound federation were incorrectly allowed when the config option was set to an empty list
* \| \| \| \| \|	Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse	Erik Johnston	2018-08-24	2	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where we broke sync when using limit_usage_by_mau
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-24	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix bug where we broke sync when using limit_usage_by_mau	Erik Johnston	2018-08-24	1	-0/+4
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We assumed that we always had service notices configured, but that is not always true
* \| \| \| \| \|	Merge pull request #3751 from matrix-org/rav/twisted_17	Richard van der Hoff	2018-08-24	2	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Pin to twisted 17.1 or later
\| * \| \| \| \|	changelog	Richard van der Hoff	2018-08-24	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Pin to twisted 17.1 or later	Richard van der Hoff	2018-08-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/matrix-org/synapse/issues/3741.
* \| \| \| \| \|	Merge pull request #3749 from matrix-org/erikj/add_trial_users	Erik Johnston	2018-08-24	8	-5/+272
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Implement trial users
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-23	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Unit tests	Erik Johnston	2018-08-23	2	-3/+227
\| \| \| \| \| \|
\| * \| \| \| \|	Implement trail users	Erik Johnston	2018-08-23	5	-2/+44
\|/ / / / /
* \| \| \| \|	Merge pull request #3747 from matrix-org/erikj/fix_multiple_sends_notice	Erik Johnston	2018-08-23	3	-1/+72
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where we resent "limit exceeded" server notices
\| * \| \| \| \|	Newsfile	Erik Johnston	2018-08-23	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix bug where we resent "limit exceeded" server notices	Erik Johnston	2018-08-23	2	-1/+71
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was due to a bug where we mutated a cached event's contents
* \| \| \| \|	Merge pull request #3734 from matrix-org/travis/worker-docs	Travis Ralston	2018-08-23	2	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Reference that the federation_reader needs the HTTP replication port set
\| * \| \| \| \|	Create 3734.misc	Travis Ralston	2018-08-21	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Reference that the federation_reader needs the HTTP replication port set	Travis Ralston	2018-08-21	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3746 from matrix-org/erikj/mau_fixups	Erik Johnston	2018-08-23	3	-1/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MAU invalidation due to missing yield
\| * \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-23	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Actually run the tests	Erik Johnston	2018-08-23	1	-0/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add missing yield	Erik Johnston	2018-08-23	1	-1/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #3680 from matrix-org/neilj/server_notices_on_blocking	Erik Johnston	2018-08-22	10	-32/+408
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	server notices on resource limit blocking
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-08-22	116	-764/+1624
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	neilj/server_notices_on_blocking
* \| \| \| \| \|	Merge branch 'master' into develop	Richard van der Hoff	2018-08-22	3	-4/+12
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Use recaptcha_ajax.js directly from Google	Richard van der Hoff	2018-08-22	2	-196/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was originally done in commit c75b71a397d91c013a65a7f57d2c13199cf4c204, but got reverted on this branch due to the PR (#3677) being based on the wrong branch. We're ready to merge this to master now, so let's make it match release-v0.33.3.
\| * \| \| \| \|	Merge tag 'v0.33.3'	Richard van der Hoff	2018-08-22	200	-3529/+5653
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Features -------- - Add support for the SNI extension to federation TLS connections. Thanks to @vojeroen! ([\#3439](https://github.com/matrix-org/synapse/issues/3439)) - Add /_media/r0/config ([\#3184](https://github.com/matrix-org/synapse/issues/3184)) - speed up /members API and add `at` and `membership` params as per MSC1227 ([\#3568](https://github.com/matrix-org/synapse/issues/3568)) - implement `summary` block in /sync response as per MSC688 ([\#3574](https://github.com/matrix-org/synapse/issues/3574)) - Add lazy-loading support to /messages as per MSC1227 ([\#3589](https://github.com/matrix-org/synapse/issues/3589)) - Add ability to limit number of monthly active users on the server ([\#3633](https://github.com/matrix-org/synapse/issues/3633)) - Support more federation endpoints on workers ([\#3653](https://github.com/matrix-org/synapse/issues/3653)) - Basic support for room versioning ([\#3654](https://github.com/matrix-org/synapse/issues/3654)) - Ability to disable client/server Synapse via conf toggle ([\#3655](https://github.com/matrix-org/synapse/issues/3655)) - Ability to whitelist specific threepids against monthly active user limiting ([\#3662](https://github.com/matrix-org/synapse/issues/3662)) - Add some metrics for the appservice and federation event sending loops ([\#3664](https://github.com/matrix-org/synapse/issues/3664)) - Where server is disabled, block ability for locked out users to read new messages ([\#3670](https://github.com/matrix-org/synapse/issues/3670)) - set admin uri via config, to be used in error messages where the user should contact the administrator ([\#3687](https://github.com/matrix-org/synapse/issues/3687)) - Synapse's presence functionality can now be disabled with the "use_presence" configuration option. ([\#3694](https://github.com/matrix-org/synapse/issues/3694)) - For resource limit blocked users, prevent writing into rooms ([\#3708](https://github.com/matrix-org/synapse/issues/3708)) Bugfixes -------- - Fix occasional glitches in the synapse_event_persisted_position metric ([\#3658](https://github.com/matrix-org/synapse/issues/3658)) - Fix bug on deleting 3pid when using identity servers that don't support unbind API ([\#3661](https://github.com/matrix-org/synapse/issues/3661)) - Make the tests pass on Twisted < 18.7.0 ([\#3676](https://github.com/matrix-org/synapse/issues/3676)) - Don’t ship recaptcha_ajax.js, use it directly from Google ([\#3677](https://github.com/matrix-org/synapse/issues/3677)) - Fixes test_reap_monthly_active_users so it passes under postgres ([\#3681](https://github.com/matrix-org/synapse/issues/3681)) - Fix mau blocking calulation bug on login ([\#3689](https://github.com/matrix-org/synapse/issues/3689)) - Fix missing yield in synapse.storage.monthly_active_users.initialise_reserved_users ([\#3692](https://github.com/matrix-org/synapse/issues/3692)) - Improve HTTP request logging to include all requests ([\#3700](https://github.com/matrix-org/synapse/issues/3700)) - Avoid timing out requests while we are streaming back the response ([\#3701](https://github.com/matrix-org/synapse/issues/3701)) - Support more federation endpoints on workers ([\#3705](https://github.com/matrix-org/synapse/issues/3705), [\#3713](https://github.com/matrix-org/synapse/issues/3713)) - Fix "Starting db txn 'get_all_updated_receipts' from sentinel context" warning ([\#3710](https://github.com/matrix-org/synapse/issues/3710)) - Fix bug where `state_cache` cache factor ignored environment variables ([\#3719](https://github.com/matrix-org/synapse/issues/3719)) - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723)) - Fix bug introduced in v0.33.3rc1 which made the ToS give a 500 error ([\#3732](https://github.com/matrix-org/synapse/issues/3732)) Deprecations and Removals ------------------------- - The Shared-Secret registration method of the legacy v1/register REST endpoint has been removed. For a replacement, please see [the admin/register API documentation](https://github.com/matrix-org/synapse/blob/master/docs/admin_api/register_api.rst). ([\#3703](https://github.com/matrix-org/synapse/issues/3703)) Internal Changes ---------------- - The test suite now can run under PostgreSQL. ([\#3423](https://github.com/matrix-org/synapse/issues/3423)) - Refactor HTTP replication endpoints to reduce code duplication ([\#3632](https://github.com/matrix-org/synapse/issues/3632)) - Tests now correctly execute on Python 3. ([\#3647](https://github.com/matrix-org/synapse/issues/3647)) - Sytests can now be run inside a Docker container. ([\#3660](https://github.com/matrix-org/synapse/issues/3660)) - Port over enough to Python 3 to allow the sytests to start. ([\#3668](https://github.com/matrix-org/synapse/issues/3668)) - Update docker base image from alpine 3.7 to 3.8. ([\#3669](https://github.com/matrix-org/synapse/issues/3669)) - Rename synapse.util.async to synapse.util.async_helpers to mitigate async becoming a keyword on Python 3.7. ([\#3678](https://github.com/matrix-org/synapse/issues/3678)) - Synapse's tests are now formatted with the black autoformatter. ([\#3679](https://github.com/matrix-org/synapse/issues/3679)) - Implemented a new testing base class to reduce test boilerplate. ([\#3684](https://github.com/matrix-org/synapse/issues/3684)) - Rename MAU prometheus metrics ([\#3690](https://github.com/matrix-org/synapse/issues/3690)) - add new error type ResourceLimit ([\#3707](https://github.com/matrix-org/synapse/issues/3707)) - Logcontexts for replication command handlers ([\#3709](https://github.com/matrix-org/synapse/issues/3709)) - Update admin register API documentation to reference a real user ID. ([\#3712](https://github.com/matrix-org/synapse/issues/3712))
\| \| * \| \| \|	changelog for 0.33.3 v0.33.3 release-v0.33.3	Richard van der Hoff	2018-08-22	2	-1/+9
\| \| \| \| \| \|
\| \| * \| \| \|	bump version to 0.33.3	Richard van der Hoff	2018-08-22	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Update attributions and PR links in changelog	Richard van der Hoff	2018-08-22	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #3685 from matrix-org/revert-3677-master	Richard van der Hoff	2018-08-13	3	-2/+196
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Use recaptcha_ajax.js directly from Google"
\| \| * \| \| \| \|	Revert "Use recaptcha_ajax.js directly from Google"	Richard van der Hoff	2018-08-13	3	-2/+196
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #3677 from andrewshadura/master	Richard van der Hoff	2018-08-13	3	-196/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use recaptcha_ajax.js directly from Google
* \| \ \ \ \ \	Merge pull request #3724 from Half-Shot/hs/guest-fetch-event	Erik Johnston	2018-08-22	2	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow guests to use /rooms/:roomId/event/:eventId
\| * \| \| \| \| \| \|	3724.feature	Will Hunt	2018-08-20	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Allow guests to access /rooms/:roomId/event/:eventId	Will Hunt	2018-08-20	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #3659 from matrix-org/erikj/split_profiles	Erik Johnston	2018-08-22	9	-44/+78
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow profile updates to happen on workers
\| * \| \| \| \| \| \| \|	Rename WorkerProfileHandler to BaseProfileHandler	Erik Johnston	2018-08-22	2	-5/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add assert to ensure handler is only run on master	Erik Johnston	2018-08-22	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove redundant vars	Erik Johnston	2018-08-22	1	-3/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add some fixmes	Erik Johnston	2018-08-17	2	-0/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Call UserDirectoryHandler methods directly	Erik Johnston	2018-08-17	4	-104/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out that the user directory handling is fairly racey as a bunch of stuff assumes that the processing happens on master, which it doesn't when there is a synapse.app.user_dir worker. So lets just call the function directly until we actually get round to fixing it, since it doesn't make the situation any worse.
\| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-08-17	244	-2980/+3681
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/split_profiles
\| * \| \| \| \| \| \| \| \|	Split ProfileHandler into master and worker	Erik Johnston	2018-08-17	3	-11/+21
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remote profile cache should remain in master worker	Erik Johnston	2018-08-17	1	-4/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Docstrings	Erik Johnston	2018-08-09	1	-1/+11
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-08-09	67	-408/+1156
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/split_profiles
\| * \| \| \| \| \| \| \| \| \|	Update workers.rst with new paths	Erik Johnston	2018-08-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Allow ratelimiting on workers	Erik Johnston	2018-08-07	1	-29/+29
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Allow profile changes to happen on workers	Erik Johnston	2018-08-07	5	-8/+106
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3673 from matrix-org/erikj/refactor_state_handler	Erik Johnston	2018-08-22	13	-277/+437
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor state module to support multiple room versions
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-08-20	208	-3244/+4271
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/refactor_state_handler
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove redundant room_version checks	Erik Johnston	2018-08-20	2	-15/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert spurious change	Erik Johnston	2018-08-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix tests	Erik Johnston	2018-08-09	6	-5/+46
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add fast path in state res for zero prev events	Erik Johnston	2018-08-09	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Choose state algorithm based on room version	Erik Johnston	2018-08-09	4	-16/+105
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add constants for room versions	Erik Johnston	2018-08-09	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactor state module	Erik Johnston	2018-08-09	2	-296/+325
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We split out the actual state resolution algorithm to prepare for having multiple versions.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3735 from matrix-org/travis/federation-spelling	Richard van der Hoff	2018-08-22	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	limt -> limit
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Create 3735.misc	Travis Ralston	2018-08-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	limt -> limit	Travis Ralston	2018-07-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/release-v0.33.3' into develop	Richard van der Hoff	2018-08-22	2	-3/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| / / \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3732 from matrix-org/rav/fix_gdpr_consent	Richard van der Hoff	2018-08-22	2	-3/+13
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error from /consent form
\| \| * \| \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	fix another consent encoding fail	Richard van der Hoff	2018-08-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error from /consent form	Richard van der Hoff	2018-08-21	1	-2/+11
\| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3731
* \| \| \| \| \| \| \| \| \| \| \| \|	Split the state_group_cache in two (#3726)	Matthew Hodgson	2018-08-22	3	-28/+236
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Splits the state_group_cache in two. One half contains normal state events; the other contains member events. The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache. This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching. Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow. Hopefully fixes https://github.com/matrix-org/synapse/issues/3720.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge tag 'v0.33.3rc2' into develop	Richard van der Hoff	2018-08-21	46	-46/+91
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bugfixes -------- - Fix bug in v0.33.3rc1 which caused infinite loops and OOMs ([\#3723](https://github.com/matrix-org/synapse/issues/3723))
\| * \| \| \| \| \| \| \| \| \| \| \|	changelog v0.33.3rc2	Amber Brown	2018-08-21	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3723 from matrix-org/rav/fix_logcontext_disaster	Amber Brown	2018-08-21	3	-3/+18
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix exceptions when a connection is closed before we read the headers
\| \| * \| \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix exceptions when a connection is closed before we read the headers	Richard van der Hoff	2018-08-20	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes bugs introduced in #3700, by making sure that we behave sanely when an incoming connection is closed before the headers are read.
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Robustness fix for logcontext filter	Richard van der Hoff	2018-08-20	1	-1/+7
\| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the logcontext filter not explode if it somehow ends up with a logcontext of None, since that infinite-loops the whole logging system.
\| * \| \| \| \| \| \| \| \| \| \| \|	changelog v0.33.3rc1	Amber Brown	2018-08-21	43	-42/+64
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	version	Amber Brown	2018-08-21	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3727 from matrix-org/erikj/dont_error_on_missing_keys	Erik Johnston	2018-08-21	3	-5/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't log exceptions when failing to fetch server keys
\| * \| \| \| \| \| \| \| \| \| \| \|	Log more detail when we fail to authenticate request	Erik Johnston	2018-08-21	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Don't log exceptions when failing to fetch server keys	Erik Johnston	2018-08-21	2	-4/+8
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not being able to resolve or connect to remote servers is an expected error, so we shouldn't log at ERROR with stacktraces.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3722 from matrix-org/erikj/bg_process_iteration	Erik Johnston	2018-08-21	3	-8/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	LaterGauge needs to call thread safe functions
\| * \| \| \| \| \| \| \| \| \| \|	Fix typo	Erik Johnston	2018-08-21	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	isort	Erik Johnston	2018-08-21	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make the in flight requests metrics thread safe	Erik Johnston	2018-08-20	1	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make the in flight background process metrics thread safe	Erik Johnston	2018-08-20	1	-5/+20
\|/ / / / / / / / / / /
* \| \| / / / / / / / /	Port over enough to get some sytests running on Python 3 (#3668)	Amber Brown	2018-08-20	12	-40/+91
\| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #3719 from matrix-org/erikj/use_cache_fact	Erik Johnston	2018-08-20	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use get_cache_factor_for function for `state_cache`
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use get_cache_factor_for function for `state_cache`	Erik Johnston	2018-08-20	1	-2/+2
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the cache factor for `state_cache` to be individually specified in the enviroment
* \| \| \| \| \| \| \| \| \|	Merge pull request #3713 from matrix-org/erikj/fixup_fed_logging	Erik Johnston	2018-08-20	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix logging bug in EDU handling over replication
\| * \| \| \| \| \| \| \| \| \|	Newsfile	Erik Johnston	2018-08-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix logging bug in EDU handling over replication	Erik Johnston	2018-08-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands	Richard van der Hoff	2018-08-17	9	-20/+54
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logcontexts for replication command handlers
\| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Logcontexts for replication command handlers	Richard van der Hoff	2018-08-17	8	-20/+53
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run the handlers for replication commands as background processes. This should improve the visibility in our metrics, and reduce the number of "running db transaction from sentinel context" warnings. Ideally it means converting the things that fire off deferreds into the night into things that actually return a Deferred when they are done. I've made a bit of a stab at this, but it will probably be leaky.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates	Richard van der Hoff	2018-08-17	6	-21/+29
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix logcontexts for running pushers
\| * \| \| \| \| \| \| \| \| \| \|	changelog	Richard van der Hoff	2018-08-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix logcontexts for running pushers	Richard van der Hoff	2018-08-17	5	-21/+28
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts.
* \| \| \| \| \| \| \| \| \| \|	Integrate presence from hotfixes (#3694)	Amber Brown	2018-08-18	17	-67/+303
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Remove v1/register's broken shared secret functionality (#3703)	Amber Brown	2018-08-18	2	-54/+1
\| \| \| \| \| \| \| \| \| \| \|