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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends	Erik Johnston	2018-04-10	2	-55/+56
\|\ \| \| \| \|	Limit concurrent event sends for a room
\| *	Note why we're limiting concurrent event sends	Erik Johnston	2018-04-10	1	-0/+5
\| \|
\| *	Limit concurrent event sends for a room	Erik Johnston	2018-04-09	1	-49/+50
\| \|
\| *	Use create_and_send_nonmember_event everywhere	Erik Johnston	2018-04-09	1	-6/+1
\| \|
* \|	Merge pull request #3078 from matrix-org/erikj/federation_sender	Erik Johnston	2018-04-10	1	-15/+41
\|\ \ \| \| \| \| \| \|	Send federation events concurrently
\| * \|	Use run_in_background instead	Erik Johnston	2018-04-10	1	-1/+1
\| \| \|
\| * \|	Preserve log contexts correctly	Erik Johnston	2018-04-10	1	-1/+4
\| \| \|
\| * \|	Log event ID on exception	Erik Johnston	2018-04-10	1	-1/+4
\| \| \|
\| * \|	Handle all events in a room correctly	Erik Johnston	2018-04-09	1	-1/+2
\| \| \|
\| * \|	Send federation events concurrently	Erik Johnston	2018-04-09	1	-4/+18
\| \| \|
\| * \|	Handle exceptions in get_hosts_for_room when sending events over federation	Erik Johnston	2018-04-09	1	-11/+16
\| \|/
* \|	Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ↵	Neil Johnson	2018-04-10	3	-7/+62
\|\ \ \| \| \| \| \| \| \| \| \|	develop
\| * \|	remove errant print v0.27.3-rc2	Neil Johnson	2018-04-09	1	-1/+1
\| \| \|
\| * \|	Fix msec to sec, again	Neil Johnson	2018-04-09	1	-3/+3
\| \| \|
\| * \|	Fix msec to sec	Neil Johnson	2018-04-09	1	-1/+1
\| \| \|
\| * \|	v0.27.3-rc2	Neil Johnson	2018-04-09	1	-0/+5
\| \| \|
\| * \|	Fix psycopg2 interpolation	Neil Johnson	2018-04-09	1	-5/+5
\| \| \|
\| * \|	version bump v0.27.3-rc2	Neil Johnson	2018-04-09	1	-1/+1
\| \| \|
\| * \|	Merge branch 'develop' of https://github.com/matrix-org/synapse into ↵	Neil Johnson	2018-04-09	35	-186/+728
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	release-v0.27.0
\| * \ \	Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ↵	Neil Johnson	2018-04-09	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	release-v0.27.0
\| \| * \| \|	Update CHANGES.rst	Neil Johnson	2018-04-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse into ↵	Neil Johnson	2018-04-09	1	-4/+8
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	release-v0.27.0
\| \| * \| \|	Update CHANGES.rst	Neil Johnson	2018-04-09	1	-1/+2
\| \| \| \| \|
\| \| * \| \|	Update CHANGES.rst	Neil Johnson	2018-04-09	1	-3/+6
\| \| \| \| \|
\| * \| \| \|	bump version to release candidate	Neil Johnson	2018-04-09	1	-1/+1
\| \|/ / /
\| * \| \|	bump version v0.27.3-rc1	Neil Johnson	2018-04-09	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'develop' into release-v0.27.0	Neil Johnson	2018-04-09	20	-47/+88
\| \|\ \ \
\| * \| \| \|	0.27.3	Neil Johnson	2018-04-09	1	-0/+46
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3082 from matrix-org/erikj/urlencode_paths	Erik Johnston	2018-04-10	1	-48/+80
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	URL quote path segments over federation
\| * \| \| \| \|	Ensure slashes are escaped	Erik Johnston	2018-04-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	URL quote path segments over federation	Erik Johnston	2018-04-10	1	-48/+80
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #2996 from krombel/allow_auto_join_rooms	Richard van der Hoff	2018-04-10	3	-34/+35
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	move handling of auto_join_rooms to RegisterHandler
\| * \ \ \ \	Merge branch 'develop' of into allow_auto_join_rooms	Krombel	2018-03-28	53	-111/+264
\| \|\ \ \ \ \
\| * \| \| \| \| \|	move handling of auto_join_rooms to RegisterHandler	Krombel	2018-03-14	3	-34/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de>
* \| \| \| \| \| \|	Merge pull request #3061 from NotAFile/add-some-byte-strings	Richard van der Hoff	2018-04-09	6	-14/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add b prefixes to some strings that are bytes in py3
\| * \| \| \| \| \| \|	Add b prefixes to some strings that are bytes in py3	Adrian Tschira	2018-04-04	6	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has no effect on python2 Signed-off-by: Adrian Tschira <nota@notafile.com>
* \| \| \| \| \| \| \|	Merge pull request #3073 from NotAFile/use-six-reraise	Richard van der Hoff	2018-04-09	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace old-style raise with six.reraise
\| * \| \| \| \| \| \| \|	Replace old-style raise with six.reraise	Adrian Tschira	2018-04-06	1	-1/+3
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The old style raise is invalid syntax in python3. As noted in the docs, this adds one more frame in the traceback, but I think this is acceptable: <ipython-input-7-bcc5cba3de3f> in <module>() 16 except: 17 pass ---> 18 six.reraise(*x) /usr/lib/python3.6/site-packages/six.py in reraise(tp, value, tb) 691 if value.__traceback__ is not tb: 692 raise value.with_traceback(tb) --> 693 raise value 694 finally: 695 value = None <ipython-input-7-bcc5cba3de3f> in <module>() 9 10 try: ---> 11 x() 12 except: 13 x = sys.exc_info() Also note that this uses six, which is not formally a dependency yet, but is included indirectly since most packages depend on it. Signed-off-by: Adrian Tschira <nota@notafile.com>
* \| \| \| \| \| \| \|	Merge pull request #2938 from dklug/develop	Richard van der Hoff	2018-04-09	1	-1/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return 401 for invalid access_token on logout
\| * \| \| \| \| \| \| \|	Return 401 for invalid access_token on logout	dklug	2018-03-02	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Duncan Klug <dklug@ucmerced.edu>
* \| \| \| \| \| \| \| \|	Merge pull request #3074 from NotAFile/fix-py3-prints	Richard van der Hoff	2018-04-09	1	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use python3-compatible prints
\| * \| \| \| \| \| \| \| \|	use python3-compatible prints	Adrian Tschira	2018-04-06	1	-5/+5
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #3075 from NotAFile/six-type-checks	Richard van der Hoff	2018-04-09	5	-8/+18
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace some type checks with six type checks
\| * \| \| \| \| \| \| \| \|	Replace some type checks with six type checks	Adrian Tschira	2018-04-07	5	-8/+18
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
* \| \| \| \| \| \| \| \|	Merge pull request #3016 from silkeh/improve-service-lookups	Richard van der Hoff	2018-04-09	2	-122/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve handling of SRV records for federation connections
\| * \| \| \| \| \| \| \| \|	Remove address resolution of hosts in SRV records	Silke	2018-04-04	2	-122/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Silke Hofstra <silke@slxh.eu>
* \| \| \| \| \| \| \| \| \|	Merge pull request #3069 from krombel/update_prometheus_config	Richard van der Hoff	2018-04-09	3	-19/+19
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update prometheus dashboard to use new metric names
\| * \| \| \| \| \| \| \| \| \|	make prometheus config compliant to v0.28	Krombel	2018-04-05	3	-19/+19
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3080 from matrix-org/rav/fix_500_on_rejoin	Richard van der Hoff	2018-04-09	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \|	Return a 404 rather than a 500 on rejoining empty rooms
\| * \| \| \| \| \| \| \| \| \|	Return a 404 rather than a 500 on rejoining empty rooms	Richard van der Hoff	2018-04-09	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter ourselves out of the server list before checking for an empty remote host list, to fix 500 error Fixes #2141
* \| \| \| \| \| \| \| \| \| \|	Revert "Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics"	Richard van der Hoff	2018-04-09	5	-28/+52
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We aren't ready to release this yet, so I'm reverting it for now. This reverts commit d1679a4ed7947b0814e0f2af9b888a16c588f1a1, reversing changes made to e089100c6231541c446e37e157dec8feed02d283.
* \| \| \| \| \| \| \| \| \|	Merge pull request #3046 from matrix-org/dbkr/join_group	Luke Barnard	2018-04-06	5	-25/+133
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement group join API
\| * \| \| \| \| \| \| \| \| \|	de-lint, quote consistency	Luke Barnard	2018-04-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Explicitly grab individual columns from group object	Luke Barnard	2018-04-06	1	-6/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	When exposing group state, return is_openly_joinable	Luke Barnard	2018-04-06	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as opposed to join_policy, which is really only pertinent to the synapse implementation of the group server. By doing this we keep the group server concept extensible by allowing arbitrarily complex rules for deciding whether a group is openly joinable.
\| * \| \| \| \| \| \| \| \| \|	By default, join policy is "invite"	Luke Barnard	2018-04-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	add_user -> _add_user	Luke Barnard	2018-04-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	pep8	Luke Barnard	2018-04-06	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Get group_info from existing call to check_group_is_ours	Luke Barnard	2018-04-06	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't use redundant inlineCallbacks	Luke Barnard	2018-04-06	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	join_rule -> join_policy	Luke Barnard	2018-04-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	is_joinable -> join_rule	Luke Barnard	2018-04-06	2	-5/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix federation client `set_group_joinable` typo	Luke Barnard	2018-04-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Factor out add_user from accept_invite and join_group	Luke Barnard	2018-04-06	1	-41/+29
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	pep8	David Baker	2018-04-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Implement group join API	David Baker	2018-04-06	5	-4/+124
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3071 from matrix-org/erikj/resp_size_metrics	Erik Johnston	2018-04-06	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add response size metrics
\| * \| \| \| \| \| \| \| \| \| \|	Add response size metrics	Erik Johnston	2018-04-06	1	-0/+7
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3072 from matrix-org/rav/fix_port_script	Richard van der Hoff	2018-04-06	1	-33/+48
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	postgres port script: fix state_groups_pkey error
\| * \| \| \| \| \| \| \| \| \|	Port script: Set up state_group_id_seq	Richard van der Hoff	2018-04-06	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/matrix-org/synapse/issues/3050.
\| * \| \| \| \| \| \| \| \| \|	Port script: clean up a bit	Richard van der Hoff	2018-04-06	1	-25/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve logging and comments. Group all the stuff to do with inspecting tables together rather than creating the port tables in the middle.
\| * \| \| \| \| \| \| \| \| \|	Port script: avoid nasty errors when setting up	Richard van der Hoff	2018-04-06	1	-8/+6
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We really shouldn't spit out "Failed to create port table", it looks scary.
* \| \| \| \| \| \| \| \| \|	Merge pull request #3070 from krombel/group_join_put_instead_post	Erik Johnston	2018-04-06	3	-3/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	use PUT instead of POST for federating groups/m.join_policy
\| * \| \| \| \| \| \| \| \|	use PUT instead of POST for federating groups/m.join_policy	Krombel	2018-04-06	3	-3/+7
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	more verbosity in synctl	Richard van der Hoff	2018-04-06	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2886 from turt2live/travis/new-worker-docs	Richard van der Hoff	2018-04-05	1	-2/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a blurb explaining the main synapse worker
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docs	Travis Ralston	2018-04-04	126	-2530/+3869
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Document the additional routes for the event_creator worker	Travis Ralston	2018-04-04	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://github.com/matrix-org/synapse/issues/3018 Signed-off-by: Travis Ralston <travpc@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Move the mention of the main synapse worker higher up	Travis Ralston	2018-04-04	1	-13/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Add a blurb explaining the main synapse worker	Travis Ralston	2018-02-17	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Travis Ralston <travpc@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2986 from jplatte/join_reponse_room_id	Richard van der Hoff	2018-04-05	1	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add room_id to the response of `rooms/{roomId}/join`
\| * \| \| \| \| \| \| \| \| \| \|	Add room_id to the response of `rooms/{roomId}/join`	Jonas Platte	2018-03-13	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2349
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3068 from matrix-org/rav/fix_cache_invalidation	Richard van der Hoff	2018-04-05	2	-26/+84
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve database cache performance
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix overzealous cache invalidation	Richard van der Hoff	2018-04-05	2	-26/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes an issue where a cache invalidation would invalidate all pending entries, rather than just the entry that we intended to invalidate.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3066 from matrix-org/rav/remove_redundant_metrics	Richard van der Hoff	2018-04-05	5	-52/+28
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant metrics which were deprecated in 0.27.0.
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove redundant metrics which were deprecated in 0.27.0.	Richard van der Hoff	2018-04-04	5	-52/+28
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3045 from matrix-org/dbkr/group_joinable	Luke Barnard	2018-04-05	8	-0/+157
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add joinability for groups
\| * \| \| \| \| \| \| \| \| \| \| \|	NON NULL -> NOT NULL	Luke Barnard	2018-04-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Use "/settings/" (plural)	Luke Barnard	2018-04-05	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Use DEFAULT join_policy of "invite" in db	Luke Barnard	2018-04-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Document set_group_join_policy	Luke Barnard	2018-04-05	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Use join_policy API instead of joinable	Luke Barnard	2018-04-03	7	-23/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The API is now under /groups/$group_id/setting/m.join_policy and expects a JSON blob of the shape ```json { "m.join_policy": { "type": "invite" } } ``` where "invite" could alternatively be "open".
\| * \| \| \| \| \| \| \| \| \| \| \|	This should probably be a PUT	David Baker	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	OK, smallint it is then	David Baker	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Grr. Copy the definition from is_admin	David Baker	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	pep8	David Baker	2018-03-28	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Make column definition that works on both dbs	David Baker	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add schema delta file	David Baker	2018-03-28	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add joinability for groups	David Baker	2018-03-28	7	-1/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds API to set the 'joinable' flag, and corresponding flag in the table.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3041 from matrix-org/r30_stats	Neil Johnson	2018-04-05	5	-7/+115
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	R30 stats
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Review comments	Neil Johnson	2018-04-05	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use iteritems over item to loop over dict formatting
\| * \| \| \| \| \| \| \| \| \| \| \| \|	pep8	Neil Johnson	2018-03-29	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove need for sqlite specific query	Neil Johnson	2018-03-29	1	-30/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fix pep8 errors	Neil Johnson	2018-03-28	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	remove twisted deferral cruft	Neil Johnson	2018-03-28	1	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	bump schema version	Neil Johnson	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Support multi client R30 for psql	Neil Johnson	2018-03-28	2	-9/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	rename stat to future proof	Neil Johnson	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add user_ips last seen index	Neil Johnson	2018-03-28	2	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	No need to cast in count_daily_users	Neil Johnson	2018-03-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	query and call for r30 stats	Neil Johnson	2018-03-28	2	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	count_daily_users failed if db was sqlite due to type failure - presumably ↵	Neil Johnson	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this prevcented all sqlite homeservers reporting home
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3060 from matrix-org/rav/kill_event_content	Richard van der Hoff	2018-04-05	3	-7/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Remove uses of events.content
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove uses of events.content	Richard van der Hoff	2018-03-29	3	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3063 from matrix-org/jcgruenhage/cache_settings_stats	Jan Christian Grünhage	2018-04-04	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	phone home cache size configurations
\| * \| \| \| \| \| \| \| \| \| \| \| \|	phone home cache size configurations	Jan Christian Grünhage	2018-04-04	1	-0/+3
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3062 from matrix-org/revert-3053-speedup-mxid-check	Richard van der Hoff	2018-04-04	1	-4/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Revert "improve mxid check performance"
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert "improve mxid check performance"	Richard van der Hoff	2018-04-04	1	-4/+3
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3000 from NotAFile/change-except-style	Richard van der Hoff	2018-04-04	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace old style error catching with 'as' keyword
\| * \| \| \| \| \| \| \| \| \| \| \|	replace old style error catching with 'as' keyword	NotAFile	2018-03-15	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is both easier to read and compatible with python3 (not that that matters) Signed-off-by: Adrian Tschira <nota@notafile.com>
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3044 from matrix-org/michaelk/performance_stats	Richard van der Hoff	2018-04-04	2	-0/+45
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add basic performance statistics to phone home
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Handle review comments	Michael Kaye	2018-03-28	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	As daemonizing will make a new process, defer call to init.	Michael Kaye	2018-03-28	1	-13/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Include coarse CPU and Memory use in stats callbacks.	Michael Kaye	2018-03-27	2	-0/+32
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This requires the psutil module, and is still opt-in based on the report_stats config option.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3053 from NotAFile/speedup-mxid-check	Richard van der Hoff	2018-04-04	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	improve mxid check performance
\| * \| \| \| \| \| \| \| \| \| \| \|	improve mxid check performance ~4x	Adrian Tschira	2018-03-31	1	-3/+4
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Adrian Tschira <nota@notafile.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3049 from matrix-org/rav/use_staticjson	Richard van der Hoff	2018-04-03	4	-20/+34
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use static JSONEncoders
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix json encoding bug in replication	Richard van der Hoff	2018-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	json encoders have an encode method, not a dumps method.
\| * \| \| \| \| \| \| \| \| \| \| \|	Use static JSONEncoders	Richard van der Hoff	2018-03-29	4	-20/+34
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using json.dumps with custom options requires us to create a new JSONEncoder on each call. It's more efficient to create one upfront and reuse it.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #3048 from matrix-org/rav/use_simplejson	Richard van der Hoff	2018-04-03	3	-5/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Use simplejson throughout
\| * \| \| \| \| \| \| \| \| \| \|	Use simplejson throughout	Richard van der Hoff	2018-03-29	3	-5/+9
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let's use simplejson rather than json, for consistency.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3043 from matrix-org/erikj/measure_state_group_creation	Erik Johnston	2018-03-28	1	-27/+28
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Measure time it takes to calculate state group ID
\| * \| \| \| \| \| \| \| \| \| \|	Measure time it takes to calculate state group ID	Erik Johnston	2018-03-28	1	-27/+28
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3034 from matrix-org/rav/fix_key_claim_errors	Richard van der Hoff	2018-03-28	1	-28/+28
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \|	Fix error when claiming e2e keys from offline servers
\| * \| \| \| \| \| \| \| \| \|	Stringify exceptions for keys/{query,claim}	Richard van der Hoff	2018-03-27	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure we stringify any exceptions we return from keys/query and keys/claim, to avoid a 'not JSON serializable' error later Fixes #3010
\| * \| \| \| \| \| \| \| \| \|	factor out exception handling for keys/claim and keys/query	Richard van der Hoff	2018-03-27	1	-28/+25
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this stuff is badly c&p'ed
* \| \| \| \| \| \| \| \| \|	Merge pull request #3042 from matrix-org/fix_locally_failing_tests	Erik Johnston	2018-03-28	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	fix tests/storage/test_user_directory.py
\| * \| \| \| \| \| \| \| \|	Fix search_user_dir multiple sqlite versions do different things	Neil Johnson	2018-03-28	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix tests/storage/test_user_directory.py	Neil Johnson	2018-03-28	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_id	Erik Johnston	2018-03-28	2	-7/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Linearize calls to _generate_user_id
\| * \| \| \| \| \| \| \| \|	Also do check inside linearizer	Erik Johnston	2018-03-27	1	-3/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	PEP8	Erik Johnston	2018-03-26	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Don't use _cursor_to_dict in find_next_generated_user_id_localpart	Erik Johnston	2018-03-26	1	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Linearize calls to _generate_user_id	Erik Johnston	2018-03-26	1	-4/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #3030 from matrix-org/erikj/no_ujson	Erik Johnston	2018-03-28	2	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove last usage of ujson
\| * \| \| \| \| \| \| \| \| \|	Remove last usage of ujson	Erik Johnston	2018-03-26	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3033 from matrix-org/erikj/calculate_state_metrics	Erik Johnston	2018-03-28	1	-1/+38
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Add counter metrics for calculating state delta
\| * \| \| \| \| \| \| \| \| \|	Comment	Erik Johnston	2018-03-27	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix indent	Erik Johnston	2018-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Comment	Erik Johnston	2018-03-27	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add counter metrics for calculating state delta	Erik Johnston	2018-03-27	1	-1/+30
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow us to measure how often we calculate state deltas in event persistence that we would have been able to calculate at the same time we calculated the state for the event.
* \| \| \| \| \| \| \| \| \|	Merge pull request #3017 from matrix-org/erikj/add_cache_control_headers	Erik Johnston	2018-03-27	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Cache-Control headers to all JSON APIs
\| * \| \| \| \| \| \| \| \| \|	Add Cache-Control headers to all JSON APIs	Erik Johnston	2018-03-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is especially important that sync requests don't get cached, as if a sync returns the same token given then the client will call sync with the same parameters again. If the previous response was cached it will get reused, resulting in the client tight looping making the same request and never making any progress. In general, clients will expect to get up to date data when requesting APIs, and so its safer to do a blanket no cache policy than only whitelisting APIs that we know will break things if they get cached.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2018-03-26	2	-1/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse v0.27.2	Erik Johnston	2018-03-26	3	-8/+18
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Bum version and changelog	Erik Johnston	2018-03-26	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'erikj/simplejson_replication' of github.com:matrix-org/synapse ↵	Erik Johnston	2018-03-26	1	-7/+9
\| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into release-v0.27.0
\| * \| \| \| \| \| \| \| \| \|	Fix date v0.27.1	Erik Johnston	2018-03-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Bump version and changelog	Erik Johnston	2018-03-26	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.0	Neil Johnson	2018-03-26	177	-4347/+8671
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	version bump	Neil Johnson	2018-03-26	2	-1/+7
\| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix typo	Matthew Hodgson	2018-03-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #3022 from matrix-org/matthew/noresource	Matthew Hodgson	2018-03-23	12	-24/+24
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \|	404 correctly on missing paths via NoResource
\| * \| \| \| \| \| \| \| \| \|	404 correctly on missing paths via NoResource	Matthew Hodgson	2018-03-23	12	-24/+24
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes https://github.com/matrix-org/synapse/issues/2043 and https://github.com/matrix-org/synapse/issues/2029
* \| \| \| \| \| \| \| \| \|	Merge pull request #3006 from matrix-org/erikj/state_iter	Erik Johnston	2018-03-22	1	-12/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use .iter* to avoid copies in StateHandler
\| * \| \| \| \| \| \| \| \| \|	Fix s/iteriterms/itervalues	Erik Johnston	2018-03-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use .iter* to avoid copies in StateHandler	Erik Johnston	2018-03-15	1	-12/+12
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse into develop	Erik Johnston	2018-03-22	4	-5/+66
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| / / / / / \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CHANGES.rst v0.27.0-rc2	Neil Johnson	2018-03-20	1	-12/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rearrange ordering of releases to match chronology
\| * \| \| \| \| \| \| \|	fix merge conflicts	Neil Johnson	2018-03-20	32	-50/+90
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Update __init__.py	Neil Johnson	2018-03-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bump version
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-03-19	1	-0/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Bump version number v0.27.0-rc1	Erik Johnston	2018-03-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #3002 from matrix-org/rav/purge_doc	Erik Johnston	2018-03-15	1	-2/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update purge_history_api.rst
\| \| * \| \| \| \| \| \| \| \|	Update purge_history_api.rst	Richard van der Hoff	2018-03-15	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clarify that `purge_history` will not purge state
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #2997 from turt2live/patch-2	Erik Johnston	2018-03-15	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	Doc: Make the event_creator routes regex a code block
\| \| * \| \| \| \| \| \| \| \|	OCD: Make the event_creator routes regex a code block	Travis Ralston	2018-03-14	1	-1/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All the others are code blocks, so this one should be to (currently it is a blockquote). Signed-off-by: Travis Ralston <travpc@gmail.com>
\| * \| \| \| \| \| \| \| \|	CHANGES.rst: reword metric deprecation	Richard van der Hoff	2018-03-15	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-03-15	1	-5/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-03-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-03-15	1	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Erik Johnston	2018-03-14	1	-62/+24
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix up rst formatting	Erik Johnston	2018-03-14	1	-6/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-03-14	1	-9/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-03-14	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-03-14	1	-68/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clean formatting
\| * \| \| \| \| \| \| \| \|	Update CHANGES.rst	Neil Johnson	2018-03-14	1	-0/+91
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WIP, need to add most recent PRs
* \| \| \| \| \| \| \| \|	Merge pull request #3015 from matrix-org/erikj/simplejson_replication	Erik Johnston	2018-03-20	1	-7/+9
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| / / / / \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|	Fix replication after switch to simplejson
\| * \| \| \| \| \| \|	Explicitly use simplejson	Erik Johnston	2018-03-20	1	-7/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix replication after switch to simplejson	Erik Johnston	2018-03-19	1	-2/+4
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out that simplejson serialises namedtuple's as dictionaries rather than tuples by default.
* \| \| \| \| \| \|	Merge pull request #3005 from matrix-org/erikj/fix_cache_size	Erik Johnston	2018-03-19	2	-5/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where state cache used lots of memory
\| * \| \| \| \| \| \|	Add comments	Erik Johnston	2018-03-19	1	-0/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix bug where state cache used lots of memory	Erik Johnston	2018-03-15	2	-5/+9
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The state cache bases its size on the sum of the size of entries. The size of the entry is calculated once on insertion, so it is important that the size of entries does not change. The DictionaryCache modified the entries size, which caused the state cache to incorrectly think it was smaller than it actually was.
* \| \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2018-03-19	27	-43/+54
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse v0.26.1	Erik Johnston	2018-03-16	27	-39/+46
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Newline	Erik Johnston	2018-03-16	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove wrong comment	Erik Johnston	2018-03-16	1	-1/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Bump version and changelog	Erik Johnston	2018-03-15	2	-1/+9
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Replace ujson with simplejson	Erik Johnston	2018-03-15	25	-38/+37
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge pull request #2798 from jeremycline/fedora-repo	Erik Johnston	2018-01-17	1	-0/+4
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that Synapse is available in Fedora
\| \| * \| \| \| \| \|	Note that Synapse is available in Fedora	Jeremy Cline	2018-01-16	1	-0/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeremy Cline <jeremy@jcline.org>
\| * \| \| \| \| \|	Merge pull request #2674 from her001/readme-sytest	Richard van der Hoff	2018-01-16	1	-0/+11
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention SyTest in the README, after Development
\| \| * \| \| \| \| \|	Mention SyTest in the README, after Development	Andrew Conrad	2017-11-14	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Andrew Conrad <aconrad103@gmail.com>
* \| \| \| \| \| \| \|	spell out not to massively increase bcrypt rounds	Matthew Hodgson	2018-03-19	1	-1/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Replace some ujson with simplejson to make it work	Erik Johnston	2018-03-16	4	-4/+5
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3003 from matrix-org/rav/fix_contributing	Erik Johnston	2018-03-15	1	-3/+7
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	CONTRIBUTING.rst: fix CI info
\| * \| \| \| \| \|	CONTRIBUTING.rst: fix CI info	Richard van der Hoff	2018-03-15	1	-3/+7
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2995 from matrix-org/erikj/enable_membership_worker	Erik Johnston	2018-03-14	1	-1/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Register membership/state servlets in event_creator
\| * \| \| \| \| \|	Register membership/state servlets in event_creator	Erik Johnston	2018-03-14	1	-1/+13
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #2992 from matrix-org/erikj/implement_member_workre	Erik Johnston	2018-03-14	4	-4/+440
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement RoomMemberWorkerHandler
\| * \| \| \| \| \|	Fix imports	Erik Johnston	2018-03-14	2	-7/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	s/join/joined/ in notify_user_membership_change	Erik Johnston	2018-03-14	2	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Split RoomMemberWorkerHandler to separate file	Erik Johnston	2018-03-14	3	-81/+104
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Implement RoomMemberWorkerHandler	Erik Johnston	2018-03-13	4	-2/+418
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2989 from matrix-org/erikj/profile_cache_master	Erik Johnston	2018-03-14	1	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only update remote profile cache on master
\| * \| \| \| \| \| \|	Only update remote profile cache on master	Erik Johnston	2018-03-13	1	-1/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2988 from matrix-org/erikj/split_profile_store	Erik Johnston	2018-03-14	2	-24/+47
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split up ProfileStore
\| * \| \| \| \| \| \| \|	Split up ProfileStore	Erik Johnston	2018-03-13	2	-24/+47
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #2991 from matrix-org/erikj/fixup_rm	Erik Johnston	2018-03-14	1	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	_remote_join and co take a requester
\| * \| \| \| \| \| \| \|	_remote_join and co take a requester	Erik Johnston	2018-03-13	1	-4/+4
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2993 from matrix-org/erikj/is_blocked	Erik Johnston	2018-03-14	1	-13/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add is_blocked to worker store
\| * \| \| \| \| \| \| \|	Add is_blocked to worker store	Erik Johnston	2018-03-13	1	-13/+17
\| \|/ / / / / / /
* / / / / / / /	fix bug #2926 (loading all state for a given type from the DB if the ↵	Matthew Hodgson	2018-03-13	1	-7/+27
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	state_key is None) (#2990) Fixes a regression that had crept in where the caching layer upholds requests for loading state which is filtered by type (but not by state_key), but the DB layer itself would interpret a missing state_key as a request to filter by null state_key rather than returning all state_keys.
* \| \| \| \| \| \|	Merge pull request #2987 from matrix-org/erikj/split_room_member_handler	Erik Johnston	2018-03-13	2	-100/+189
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Split RoomMemberHandler into base and master class
\| * \| \| \| \| \|	Raise, don't return, exception	Erik Johnston	2018-03-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add missing param to docstrings	Erik Johnston	2018-03-13	1	-0/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Correct import order	Erik Johnston	2018-03-13	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move user_*_room distributor stuff to master class	Erik Johnston	2018-03-13	1	-5/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I added yields when calling user_left_room, but they shouldn't matter on the master process as they always return None anyway.
\| * \| \| \| \| \|	Split RoomMemberHandler into base and master class	Erik Johnston	2018-03-13	2	-98/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The intention here is to split the class into the bits that can be done on workers and the bits that have to be done on the master. In future there will also be a class that can be run on the worker, which will delegate work to the master when necessary.
* \| \| \| \| \| \|	Merge pull request #2978 from matrix-org/erikj/refactor_replication_layer	Erik Johnston	2018-03-13	18	-33/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove ReplicationLayer and user Client/Server directly
\| * \| \| \| \| \| \|	s/replication_client/federation_client/	Erik Johnston	2018-03-13	17	-29/+29
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	s/replication_server/federation_server	Erik Johnston	2018-03-13	3	-4/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2981 from matrix-org/erikj/factor_remote_leave	Erik Johnston	2018-03-13	1	-22/+54
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| / / / \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	Factor out _remote_reject_invite in RoomMember
\| * \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2018-03-13	21	-120/+154
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/factor_remote_leave
\| * \| \| \| \| \| \|	Add docstring	Erik Johnston	2018-03-13	1	-0/+26
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Factor out _remote_reject_invite in RoomMember	Erik Johnston	2018-03-13	1	-22/+28
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2979 from matrix-org/erikj/no_handlers	Erik Johnston	2018-03-13	29	-112/+41
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Don't build handlers on workers unnecessarily
\| * \| \| \| \| \| \|	Don't build handlers on workers unnecessarily	Erik Johnston	2018-03-13	5	-5/+0
\| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Remove unused ReplicationLayer	Erik Johnston	2018-03-13	2	-59/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix tests	Erik Johnston	2018-03-13	10	-21/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Split replication layer into two	Erik Johnston	2018-03-13	12	-27/+19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2980 from matrix-org/erikj/rm_priv	Erik Johnston	2018-03-13	1	-7/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make RoomMemberHandler functions private that can be
\| * \| \| \| \| \| \|	Make functions private that can be	Erik Johnston	2018-03-13	1	-7/+7
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #2982 from matrix-org/erikj/fix_extra_users	Erik Johnston	2018-03-13	2	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	extra_users is actually a list of UserIDs
\| * \| \| \| \| \| \|	extra_users is actually a list of UserIDs	Erik Johnston	2018-03-13	2	-5/+5
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #2983 from matrix-org/erikj/rename_register_3pid	Erik Johnston	2018-03-13	2	-11/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor get_or_register_3pid_guest
\| * \| \| \| \| \| \|	Refactor get_or_register_3pid_guest	Erik Johnston	2018-03-13	2	-11/+25
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #2984 from matrix-org/erikj/fix_rest_regeix	Erik Johnston	2018-03-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RoomMembershipRestServlet doesn't handle /forget
\| * \| \| \| \| \| \|	RoomMembershipRestServlet doesn't handle /forget	Erik Johnston	2018-03-13	1	-1/+1
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to the order we register the REST handlers `/forget` was handled by the correct handler.
* \| \| \| \| \| \|	Merge pull request #2975 from matrix-org/rav/measure_persist_events	Richard van der Hoff	2018-03-13	1	-4/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Measure block for persist_events