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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Assume rooms likely haven't changed	Erik Johnston	2017-03-13	2	-8/+14
\|
*	Get current state by using current_state_events table	Erik Johnston	2017-03-10	5	-31/+52
\|
*	Merge pull request #1976 from matrix-org/erikj/device_delete_sync	Erik Johnston	2017-03-10	3	-4/+46
\|\ \| \| \| \|	Noop repated delete device inbox calls from /sync
\| *	Fix it for the workers	Erik Johnston	2017-03-10	1	-0/+8
\| \|
\| *	Noop repated delete device inbox calls from /sync	Erik Johnston	2017-03-10	2	-4/+38
\|/
*	Add setdefault key to ExpiringCache	Erik Johnston	2017-03-10	1	-0/+7
\|
*	Fix docstring	Richard van der Hoff	2017-03-09	1	-2/+1
\|
*	Merge pull request #1971 from matrix-org/dbkr/msisdn_signin	David Baker	2017-03-09	9	-50/+395
\|\ \| \| \| \|	Support registration & login with phone number
\| *	Comment when our 3pids would be incomplete	David Baker	2017-03-08	1	-0/+2
\| \|
\| *	Docs	David Baker	2017-03-08	1	-0/+13
\| \|
\| *	Incorrectly copied copyright	David Baker	2017-03-08	1	-1/+0
\| \| \| \| \| \| \| \|	This file post-dates OM
\| *	Not any more, it doesn't	David Baker	2017-03-08	1	-1/+0
\| \|
\| *	Better error message	David Baker	2017-03-08	1	-1/+3
\| \|
\| *	pep8	David Baker	2017-03-08	2	-1/+2
\| \|
\| *	Add msisdn util file	David Baker	2017-03-08	1	-0/+27
\| \|
\| *	Pull out datastore in initialiser	David Baker	2017-03-08	1	-5/+10
\| \|
\| *	Minor fixes from PR feedback	David Baker	2017-03-08	2	-5/+3
\| \|
\| *	Fix log line	David Baker	2017-03-08	1	-1/+1
\| \|
\| *	Typos	David Baker	2017-03-08	1	-2/+2
\| \|
\| *	Refector out assert_params_in_request	David Baker	2017-03-08	3	-37/+27
\| \| \| \| \| \| \| \|	and replace requestEmailToken where we meant requestMsisdnToken
\| *	Factor out msisdn canonicalisation	David Baker	2017-03-08	4	-41/+11
\| \| \| \| \| \| \| \|	Plus a couple of other minor fixes
\| *	Fix pep8	David Baker	2017-03-08	4	-7/+7
\| \|
\| *	Support new login format	David Baker	2017-03-07	1	-6/+91
\| \| \| \| \| \| \| \|	https://docs.google.com/document/d/1-6ZSSW5YvCGhVFDyD2QExAUAdpCWjccvJT5xiyTTG2Y/edit#
\| *	Add msisdns as 3pids during registration	David Baker	2017-03-03	1	-0/+47
\| \| \| \| \| \| \| \|	and support binding them with the bind_msisdn param
\| *	Just return the deferred straight off	David Baker	2017-03-01	1	-4/+2
\| \| \| \| \| \| \| \| \| \|	defer.returnValue doth not maketh a generator: it would need a yield to be a generator, and this doesn't need a yield.
\| *	Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin	David Baker	2017-03-01	41	-193/+816
\| \|\
\| * \|	WIP support for msisdn 3pid proxy methods	David Baker	2017-02-14	6	-19/+228
\| \| \|
* \| \|	Remove spurious SQL logging (#1972)	Richard van der Hoff	2017-03-08	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	looks like the upsert function was accidentally sending sql logging to the general logger. We already log the sql in `txn.execute`.
* \| \|	Merge pull request #1969 from matrix-org/erikj/get_distinct_devices	Erik Johnston	2017-03-06	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Select distinct devices from DB
\| * \| \|	Select distinct devices from DB	Erik Johnston	2017-03-06	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise we might pull out tonnes of duplicate user_ids and this can make synapse sad.
* \| \|	Merge pull request #1964 from matrix-org/erikj/device_list_update_fix	Erik Johnston	2017-03-03	1	-47/+123
\|\ \ \ \| \| \| \| \| \| \| \|	Fix device list update to not constantly resync
\| * \| \|	Don't keep around old stream IDs forever	Erik Johnston	2017-03-03	1	-2/+9
\| \| \| \|
\| * \| \|	Spelling	Erik Johnston	2017-03-03	1	-2/+2
\| \| \| \|
\| * \| \|	Fix device list update to not constantly resync	Erik Johnston	2017-03-01	1	-46/+115
\| \| \| \|
* \| \| \|	Merge pull request #1963 from matrix-org/erikj/delete_old_device_streams	Erik Johnston	2017-03-03	2	-0/+34
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Clobber old device list stream entries
\| * \| \|	Fix up	Erik Johnston	2017-03-03	2	-8/+8
\| \| \| \|
\| * \| \|	Add index to device_lists_stream	Erik Johnston	2017-03-01	3	-4/+28
\| \| \| \|
\| * \| \|	Clobber old device list stream entries	Erik Johnston	2017-03-01	1	-0/+10
\| \|/ /
* \| \|	kick jenkins	Paul "LeoNerd" Evans	2017-03-01	0	-0/+0
\| \| \|
* \| \|	Merge pull request #1960 from matrix-org/paul/sytest-integration	Paul Evans	2017-03-01	2	-6/+22
\|\ \ \ \| \|/ / \|/\| \|	Prepare a script for Jenkins to run sytest via dendron+haproxy
\| * \|	Added also a control script to run via the crazy dendron+haproxy hybrid ↵	Paul "LeoNerd" Evans	2017-02-28	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \|	we're temporarily using
\| * \|	No longer need to request all the sub-components to be split when running ↵	Paul "LeoNerd" Evans	2017-02-28	1	-6/+0
\|/ / \| \| \| \| \| \|	sytest+dendron
* \|	Don't log unknown cache warnings in workers	Erik Johnston	2017-02-28	1	-1/+3
\| \|
* \|	Merge pull request #1959 from matrix-org/erikj/intern_once	Erik Johnston	2017-02-28	1	-3/+2
\|\ \ \| \| \| \| \| \|	Intern table column names once
\| * \|	Intern table column names once	Erik Johnston	2017-02-28	1	-3/+2
\| \| \|
* \| \|	Merge pull request #1957 from matrix-org/device_poke_index	Erik Johnston	2017-02-28	2	-1/+17
\|\ \ \ \| \|/ / \|/\| \|	Add stream_id index to device_lists_outbound_pokes
\| * \|	Add stream_id index to device_lists_outbound_pokes	Erik Johnston	2017-02-28	2	-1/+17
\|/ / \| \| \| \| \| \|	As this is used for replication streaming
* \|	Fix up txn name	Erik Johnston	2017-02-28	1	-1/+1
\| \|
* \|	Pop with default value to stop throwing	Erik Johnston	2017-02-28	1	-1/+1
\| \|
* \|	merge in right archlinux package, thanks to @saram-kon from ↵	Matthew Hodgson	2017-02-28	1	-1/+1
\| \| \| \| \| \| \| \|	https://github.com/matrix-org/synapse/pull/1956
* \|	Merge pull request #1955 from matrix-org/erikj/current_state_query_bypass	Erik Johnston	2017-02-27	1	-0/+15
\|\ \ \| \| \| \| \| \|	Don't fetch current state in common case
\| * \|	Remove needless check	Erik Johnston	2017-02-27	1	-2/+0
\| \| \|
\| * \|	It should be all	Erik Johnston	2017-02-27	1	-1/+1
\| \| \|
\| * \|	Don't fetch current state in common case	Erik Johnston	2017-02-27	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we fetch the list of current state events whenever we send something in a room. This is overkill for the common case of persisting a simple chain of non-state events, so lets handle that case specially.
* \| \|	Pop rather than del from dict	Erik Johnston	2017-02-27	1	-1/+1
\|/ /
* \|	Merge pull request #1904 from Pneumaticat/patch-1	Erik Johnston	2017-02-27	1	-0/+1
\|\ \ \| \| \| \| \| \|	Fix synapse_port_db failure (fixes #1902)
\| * \|	Fix typo	Kevin Liu	2017-02-11	1	-1/+1
\| \| \| \| \| \| \| \| \|	This is what I get for not proofreading
\| * \|	Fix synapse_port_db failure (fixes #1902)	Kevin Liu	2017-02-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://matrix.to/#/!cURbafjkfsMDVwdRDQ:matrix.org/$148686272020hCgRD:potatofrom.space Signed-off-by: Kevin Liu <kevin@potatofrom.space>
* \| \|	Merge pull request #1954 from matrix-org/erikj/cache_device2	Erik Johnston	2017-02-27	1	-45/+73
\|\ \ \ \| \| \| \| \| \| \| \|	Cache get_user_devices_from_cache
\| * \| \|	Cache get_user_devices_from_cache	Erik Johnston	2017-02-27	1	-45/+73
\| \| \| \|
* \| \| \|	Merge pull request #1951 from enckse/develop	Matthew Hodgson	2017-02-27	1	-3/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	the aur package is no longer there, community package in arch does exist
\| * \| \| \|	the aur package is no longer there, community package in arch does exist	Sean Enck	2017-02-27	1	-3/+2
\|/ / / /
* \| \| \|	Merge pull request #1945 from jkolo/fix_dynamic_thumbnails_aspect	Erik Johnston	2017-02-27	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix #1677 (dynamic thumbnails aspect)
\| * \| \| \|	Fix dynamic thumbnails aspect	Jurek	2017-02-24	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1939 from matrix-org/erikj/strip_sql_newlines	Erik Johnston	2017-02-23	1	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Strip newlines from SQL queries
\| * \| \| \| \|	Strip newlines from SQL queries	Erik Johnston	2017-02-23	1	-0/+6
\|/ / / / /
* \| \| \| \|	Remove lock from rotate notifs	Erik Johnston	2017-02-22	1	-3/+0
\| \| \| \| \|
* \| \| \| \|	Ensure we pass positive ints to delay function	Erik Johnston	2017-02-22	1	-1/+2
\| \|/ / / \|/\| \| \|
* \| \| \|	Store looping call	Erik Johnston	2017-02-21	1	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-02-21	2	-1/+8
\|\ \ \ \
\| * \ \ \	Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse v0.19.2	Erik Johnston	2017-02-21	4	-4/+13
\| \|\ \ \ \
\| \| * \| \| \|	Bump version and changelog github/release-v0.19.2 release-v0.19.2	Erik Johnston	2017-02-21	2	-1/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Remove unused param	Erik Johnston	2017-02-20	2	-2/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Fix /context/ visibiltiy rules	Erik Johnston	2017-02-20	1	-1/+4
\| \|/ / / /
* \| \| \| \|	Merge pull request #1930 from matrix-org/rav/fix_txnq_race	Richard van der Hoff	2017-02-21	1	-9/+21
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix a race in transaction queue
\| * \| \| \| \|	Fix a race in transaction queue	Richard van der Hoff	2017-02-20	1	-9/+21
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was theoretically possible for a PDU to get queued and not sent for ages. On closer inspection I think there were bigger problems elsewhere, but we might as well fix this since it's easy.
* \| \| \| \|	Merge pull request #1929 from matrix-org/erikj/context_fix	Erik Johnston	2017-02-20	2	-3/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix /context/ visibiltiy rules
\| * \| \| \| \|	Remove unused param	Erik Johnston	2017-02-20	2	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix /context/ visibiltiy rules	Erik Johnston	2017-02-20	1	-1/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into develop	Richard van der Hoff	2017-02-20	1	-11/+21
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| / / / / \| \|/ / / /
\| * \| \| \|	Update metrics-howto.rst	Richard van der Hoff	2017-02-19	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Update metrics-howto.rst	Richard van der Hoff	2017-02-19	1	-12/+18
\| \| \| \| \|
\| * \| \| \|	Update metrics-howto.rst	Richard van der Hoff	2017-02-19	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	Fix up notif rotation	Erik Johnston	2017-02-18	1	-14/+22
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1926 from matrix-org/rav/example_log_config	Richard van der Hoff	2017-02-17	1	-0/+48
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add an example log_config file
\| * \| \| \| \|	Update example_log_config.yaml	Richard van der Hoff	2017-02-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add trailing NL
\| * \| \| \| \|	Add an example log_config file	Richard van der Hoff	2017-02-17	1	-0/+48
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1925 from matrix-org/dbkr/pushers_lang_lengthen	David Baker	2017-02-17	1	-0/+39
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the pushers lang field column longer
\| * \| \| \| \| \|	Use TEXT rather than VARCHAR	David Baker	2017-02-17	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While we're changing anyway
\| * \| \| \| \| \|	Make the pushers lang field column longer	David Baker	2017-02-17	1	-0/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To accommodate things like zh-Hans-CN Fixes https://github.com/vector-im/riot-ios/issues/1031
* \| \| \| \| \| \|	Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_ban	David Baker	2017-02-17	1	-1/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Allow forgetting rooms you're banned from
\| * \| \| \| \| \|	Allow forgetting rooms you're banned from	David Baker	2017-02-15	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1923 from matrix-org/erikj/push_action_compress	Erik Johnston	2017-02-16	1	-11/+50
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store the default push actions in a more efficient manner
\| * \| \| \| \| \| \|	Comment	Erik Johnston	2017-02-16	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Comment	Erik Johnston	2017-02-16	1	-7/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Store the default push actions in a more efficient manner	Erik Johnston	2017-02-16	1	-11/+40
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1916 from matrix-org/erikj/push_actions_delete	Erik Johnston	2017-02-16	5	-57/+340
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aggregate event push actions
\| * \| \| \| \| \| \|	Less aggressive timers	Erik Johnston	2017-02-14	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Aggregate event push actions	Erik Johnston	2017-02-14	5	-57/+340
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1921 from matrix-org/rav/fix_key_changes	Richard van der Hoff	2017-02-15	3	-11/+58
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Fix bugs in the /keys/changes api
\| * \| \| \| \| \| \|	Fix bugs in the /keys/changes api	Richard van der Hoff	2017-02-14	3	-11/+58
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* `get_forward_extremeties_for_room` takes a numeric `stream_ordering`. We were passing a `RoomStreamToken`, which meant that it returned the current extremities, rather than those corresponding to the `from_token`. However: * `get_state_ids_for_events` required a second ('types') parameter; this meant that a `TypeError` was thrown and we ended up acting as though there was no prev state. * `get_state_ids_for_events` actually returns a map from event_id to state dictionary - just looking up the state keys in it again meant that we acted as though there was no prev state. We now check if each member's state has changed since any of the extremities. Also add/fix some comments.
* \| \| \| \| \| \|	Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_work	David Baker	2017-02-14	1	-0/+5
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Make kick & ban reasons work
\| * \| \| \| \| \|	Make kick & ban reasons work	David Baker	2017-02-14	1	-0/+5
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We somehow specced APIs with reason strings, preserve the content in the events and even have the clients display them, but failed to actually pass the parameter through to the event content.
* \| \| \| \| \|	Merge pull request #1873 from matrix-org/erikj/delete_push_actions	Erik Johnston	2017-02-14	1	-3/+8
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Be more agressive about purging old room event_push_actions
\| * \| \| \| \|	Be more agressive about purging old room event_push_actions	Erik Johnston	2017-02-01	1	-3/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1914 from matrix-org/erikj/cache_presence	Erik Johnston	2017-02-13	3	-5/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache get_presence storage
\| * \| \| \| \| \|	Cache get_presence storage	Erik Johnston	2017-02-13	3	-5/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1913 from matrix-org/kegan/dont-cache-errors	Erik Johnston	2017-02-13	1	-3/+11
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	http txns: Do not cache error responses
\| * \| \| \| \| \|	Ordering is important on errbacks so add the cleanup func before creating an ↵	Kegan Dougal	2017-02-13	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ObservableDeferred
\| * \| \| \| \| \|	Pop the txn from the map in case it has already been deleted somehow	Kegan Dougal	2017-02-13	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't cache errors at all	Kegan Dougal	2017-02-13	1	-10/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	http txns: Do not cache error responses	Kegan Dougal	2017-02-13	1	-1/+10
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously we did. This meant that, amongst other errors, rate-limiting errors would be cached and prevent messages with that txn ID being sent.
* \| \| \| \| \|	Merge pull request #1912 from matrix-org/markjh/roominitialsync	Erik Johnston	2017-02-13	2	-0/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add db functions needed for room initial sync to slave
\| * \| \| \| \| \|	Add db functions needed for room initial sync to slave	Mark Haines	2017-02-13	2	-0/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1907 from andrewshadura/develop	Erik Johnston	2017-02-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use signedjson.sign instead of syutil.crypto.jsonsign
\| * \| \| \| \| \| \|	Use signedjson.sign instead of syutil.crypto.jsonsign	Andrew Shadura	2017-02-13	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Functions from syutil.crypto.jsonsign are now available in signedjson, so use that instead of depending on syutil. Signed-off-by: Andrew Shadura <andrew@shadura.me>
* \| \| \| \| \| \|	Merge pull request #1906 from tyler-smith/TS_fix_config_documentation	Erik Johnston	2017-02-13	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Fix typo in config comments.
\| * \| \| \| \| \|	Fix typo in config comments.	Tyler Smith	2017-02-11	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tyler Smith <tylersmith.me@gmail.com>
* \| \| \| \| \|	Merge pull request #1896 from DanielDent/patch-1	Erik Johnston	2017-02-09	1	-3/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CAPTCHA_SETUP.rst X-Forwarded-For docs
\| * \| \| \| \| \|	Update CAPTCHA_SETUP.rst X-Forwarded-For docs	Daniel Dent	2017-02-08	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It looks like CAPTCHA_SETUP.rst contains information relevant to an old version of Synapse, but Synapse now has a different approach to configuring use of the X-Forwarded-For header.
* \| \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-02-09	2	-1/+8
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| / / \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'release-v0.19.1' of github.com:matrix-org/synapse v0.19.1	Erik Johnston	2017-02-09	3	-10/+14
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Update version and changelog github/release-v0.19.1 release-v0.19.1	Erik Johnston	2017-02-09	2	-1/+8
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Make None check explicit	Erik Johnston	2017-02-08	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1892 from matrix-org/erikj/rejection_fwd_extrem	Erik Johnston	2017-02-08	1	-9/+6
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| / / \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	Ignore new rejected events when working out forward extremities.
\| * \| \| \| \|	Ignore new rejected events when working out forward extremeties.	Erik Johnston	2017-02-08	1	-9/+6
\| \|/ / / /
* \| \| \| \|	Merge pull request #1891 from matrix-org/dbkr/remove_unused_constants	David Baker	2017-02-08	1	-3/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove a few aspirational but unused constants
\| * \| \| \| \|	Remove a few aspirational but unused constants	David Baker	2017-02-08	1	-3/+0
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from the Kegan era
* \| \| \| \|	Merge pull request #1784 from morteza-araby/user-admin	Erik Johnston	2017-02-06	5	-3/+502
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Administration functionalities
\| * \| \| \| \|	admin,storage: added more administrator functionalities	Morteza Araby	2017-02-02	5	-3/+502
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	administrators can now: - Set displayname of users - Update user avatars - Search for users by user_id - Browse all users in a paginated API - Reset user passwords - Deactivate users Helpers for doing paginated queries has also been added to storage Signed-off-by: Morteza Araby <morteza.araby@ericsson.com>
* \| \| \| \| \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2017-02-04	2	-1/+76
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'release-v0.19.0' of github.com:matrix-org/synapse v0.19.0	Erik Johnston	2017-02-04	102	-1798/+3629
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Bump changelog and version github/release-v0.19.0 release-v0.19.0	Erik Johnston	2017-02-04	2	-1/+7
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Bump changelog and version v0.19.0-rc4	Erik Johnston	2017-02-02	2	-2/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0	Erik Johnston	2017-02-02	3	-4/+9
\| \| \|\ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1879 from matrix-org/erikj/bump_cache_factors	Erik Johnston	2017-02-02	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump cache sizes for common membership queries
\| * \| \| \| \| \| \|	Bump cache sizes for common membership queries	Erik Johnston	2017-02-02	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1878 from matrix-org/erikj/device_measure	Erik Johnston	2017-02-02	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Measure new device list stuff
\| * \| \| \| \| \| \|	Measure new device list stuff	Erik Johnston	2017-02-02	2	-1/+6
\|/ / / / / / /
\| \| * \| \| \| \|	Bump version and changelog v0.19.0-rc3	Erik Johnston	2017-02-02	2	-5/+14
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0	Erik Johnston	2017-02-02	16	-107/+135
\| \| \|\ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1877 from matrix-org/erikj/device_list_fixes	Erik Johnston	2017-02-02	2	-21/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make /keys/changes a bit more performant
\| * \| \| \| \| \| \|	Use new get_users_who_share_room_with_user	Erik Johnston	2017-02-02	1	-11/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Erik Johnston	2017-02-02	6	-29/+42
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	erikj/device_list_fixes
* \| \| \| \| \| \| \|	Merge pull request #1876 from matrix-org/erikj/shared_member_store	Erik Johnston	2017-02-02	6	-29/+42
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|	Make presence.get_new_events a bit faster
\| * \| \| \| \| \| \|	Fix replication	Erik Johnston	2017-02-02	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Comment	Erik Johnston	2017-02-02	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Comment	Erik Johnston	2017-02-02	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Comment	Erik Johnston	2017-02-02	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make presence.get_new_events a bit faster	Erik Johnston	2017-02-02	4	-29/+33
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We do this by caching the set of users a user shares rooms with.
\| \| * \| \| \| \|	sets aren't JSON serializable	Erik Johnston	2017-02-02	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use stream_ordering_to_exterm for /keys/changes	Erik Johnston	2017-02-02	1	-9/+9
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1875 from matrix-org/erikj/fix_email_push	Erik Johnston	2017-02-02	8	-57/+70
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix email push in pusher worker
\| * \| \| \| \|	Fix email push in pusher worker	Erik Johnston	2017-02-02	8	-57/+70
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was broken when device list updates were implemented, as Mailer could no longer instantiate an AuthHandler due to a dependency on federation sending.
\| \| * \| \|	Update changelog v0.19.0-rc2	Erik Johnston	2017-02-02	2	-1/+7
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0	Erik Johnston	2017-02-02	3	-5/+57
\| \| \|\ \ \ \| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #1872 from matrix-org/erikj/key_changes	Erik Johnston	2017-02-01	3	-5/+57
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Include newly joined users in /keys/changes API
\| * \| \| \| \|	Doc args	Erik Johnston	2017-02-01	2	-0/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Comment	Erik Johnston	2017-02-01	1	-0/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Include newly joined users in /keys/changes API	Erik Johnston	2017-02-01	3	-5/+43
\|/ / / / /
\| \| * \| \|	Update changelog v0.19.0-rc1	Erik Johnston	2017-02-02	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Bump version and changelog	Erik Johnston	2017-02-02	2	-1/+49
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #1871 from matrix-org/erikj/ratelimit_401	Erik Johnston	2017-02-01	2	-4/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Correctly raise exceptions for ratelimitng. Ratelimit on 401
\| * \| \| \|	Correctly raise exceptions for ratelimitng. Ratelimit on 401	Erik Johnston	2017-02-01	2	-4/+6
\|/ / / /
* \| \| \|	Wake sync up for device changes	Erik Johnston	2017-02-01	1	-1/+2
\| \| \| \|
* \| \| \|	Merge pull request #1869 from matrix-org/erikj/device_list_stream	Erik Johnston	2017-02-01	2	-0/+65
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Implement /keys/changes
\| * \| \| \|	Comment	Erik Johnston	2017-02-01	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Comment	Erik Johnston	2017-02-01	1	-1/+12
\| \| \| \| \|
\| * \| \| \|	Implement /keys/changes	Erik Johnston	2017-02-01	2	-0/+54
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1870 from matrix-org/erikj/cache_get_all_new_events	Erik Johnston	2017-02-01	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add a small cache get_all_new_events
\| * \| \| \| \|	Add a small cache get_all_new_events	Erik Johnston	2017-02-01	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1868 from matrix-org/erikj/replication_cache	Erik Johnston	2017-02-01	5	-84/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only invalidate membership caches based on the cache stream
\| * \| \| \| \| \|	Remote membership tests for replication	Erik Johnston	2017-01-31	1	-43/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is because it now relies of the caches stream, which only works on postgres. We are trying to test with sqlite.
\| * \| \| \| \| \|	Only invalidate membership caches based on the cache stream	Erik Johnston	2017-01-31	4	-41/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before we completely invalidated get_users_in_room whenever we updated any current_state_events table. This was way too aggressive.
* \| \| \| \| \| \|	Add m.room.member type to query	Erik Johnston	2017-02-01	1	-1/+1
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1867 from matrix-org/erikj/member_index	Erik Johnston	2017-02-01	3	-1/+26
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Add an index to make membership queries faster
\| * \| \| \| \|	Add an index to make membership queries faster	Erik Johnston	2017-01-31	3	-1/+26
\| \|/ / / /
* \| / / /	Up get_latest_event_ids_in_room cache	Erik Johnston	2017-02-01	1	-1/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #1866 from matrix-org/erikj/device_list_fixes	Erik Johnston	2017-02-01	2	-2/+18
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Better handle 404 response for federation /send/
\| * \| \|	Remove explicit < 400 check as apparently this is confusing	Erik Johnston	2017-01-31	1	-3/+1
\| \| \| \|
\| * \| \|	Comment	Erik Johnston	2017-01-31	1	-0/+2
\| \| \| \|
\| * \| \|	Comment	Erik Johnston	2017-01-31	1	-0/+4
\| \| \| \|
\| * \| \|	Better handle 404 response for federation /send/	Erik Johnston	2017-01-31	2	-2/+14
\| \| \| \|
* \| \| \|	Merge pull request #1864 from matrix-org/erikj/device_list_fixes	Erik Johnston	2017-01-31	1	-8/+26
\|\\| \| \| \| \| \| \| \| \| \| \|	Fix clearing out old device list outbound pokes
\| * \| \|	Fix deletion of old sent devices correctly	Erik Johnston	2017-01-31	1	-5/+17
\| \| \| \|
\| * \| \|	Only fetch with row ts and count > 1	Erik Johnston	2017-01-31	1	-1/+2
\| \| \| \|
\| * \| \|	Fix clearing out old device list outbound pokes	Erik Johnston	2017-01-31	1	-2/+7
\| \| \| \|
* \| \| \|	Merge pull request #1862 from matrix-org/erikj/presence_update	Erik Johnston	2017-01-31	2	-5/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Use DB cache of joined users for presence
\| * \| \| \|	Stream cache invalidations for room membership storage functions	Erik Johnston	2017-01-30	1	-2/+6
\| \| \| \| \|
\| * \| \| \|	Use DB cache of joined users for presence	Erik Johnston	2017-01-30	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1861 from matrix-org/erikj/device_list_fixes	Erik Johnston	2017-01-30	6	-25/+63
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Device List fixes
\| * \| \| \|	Don't have such a large cache	Erik Johnston	2017-01-30	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix unit tests	Erik Johnston	2017-01-30	3	-7/+15
\| \| \| \| \|
\| * \| \| \|	Noop device key changes if they're the same	Erik Johnston	2017-01-30	3	-15/+45
\| \| \| \| \|
\| * \| \| \|	Fix query	Erik Johnston	2017-01-30	1	-1/+1
\| \|/ / /
\| * / /	Use get_users_in_room and declare it iterable	Erik Johnston	2017-01-30	2	-2/+2
\|/ / /
* \| \|	Merge pull request #1857 from matrix-org/erikj/device_list_stream	Erik Johnston	2017-01-30	27	-120/+1032
\|\ \ \ \| \| \| \| \| \| \| \|	Implement device lists updates over federation
\| * \| \|	Rename func	Erik Johnston	2017-01-30	2	-2/+2
\| \| \| \|
\| * \| \|	Remove debug logging	Erik Johnston	2017-01-30	1	-1/+0
\| \| \| \|
\| * \| \|	Clear out old destination pokes.	Erik Johnston	2017-01-30	1	-0/+42
\| \| \| \|
\| * \| \|	Always use the latest stream_id, sent or unsent	Erik Johnston	2017-01-30	1	-4/+4
\| \| \| \|
\| * \| \|	Add ts column to device_lists_outbound_pokes	Erik Johnston	2017-01-27	2	-1/+5
\| \| \| \|
\| * \| \|	Hook device list updates to replication	Erik Johnston	2017-01-27	7	-29/+159
\| \| \| \|
\| * \| \|	Comment	Erik Johnston	2017-01-27	1	-0/+2
\| \| \| \|
\| * \| \|	Comment	Erik Johnston	2017-01-27	1	-0/+2
\| \| \| \|
\| * \| \|	SQL param ordering	Erik Johnston	2017-01-27	1	-1/+1
\| \| \| \|
\| * \| \|	User if rather than for	Erik Johnston	2017-01-27	1	-1/+4
\| \| \| \|
\| * \| \|	Better name	Erik Johnston	2017-01-27	2	-2/+4
\| \| \| \|
\| * \| \|	Remove unused param	Erik Johnston	2017-01-27	1	-2/+1
\| \| \| \|
\| * \| \|	Fix unit tests	Erik Johnston	2017-01-26	1	-0/+17
\| \| \| \|
\| * \| \|	Fix on sqlite: use left rather than outer join	Erik Johnston	2017-01-26	1	-3/+3
\| \| \| \|
\| * \| \|	Handle users leaving rooms	Erik Johnston	2017-01-26	2	-1/+24
\| \| \| \|
\| * \| \|	Add comments	Erik Johnston	2017-01-26	4	-7/+61
\| \| \| \|
\| * \| \|	Implement device key caching over federation	Erik Johnston	2017-01-26	13	-57/+381
\| \| \| \|
\| * \| \|	Fix up sending of m.device_list_update edus	Erik Johnston	2017-01-25	3	-80/+82
\| \| \| \|
\| * \| \|	Add basic implementation of local device list changes	Erik Johnston	2017-01-25	14	-39/+348
\| \| \| \|
* \| \| \|	Merge pull request #1852 from matrix-org/paul/issue-1382	Paul Evans	2017-01-25	1	-2/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Don't clobber a displayname or avatar_url if provided by an m.room.member event
\| * \| \|	Don't clobber a displayname or avatar_url if provided by an m.room.member event	Paul "LeoNerd" Evans	2017-01-24	1	-2/+4
\|/ / /
* \| \|	Merge branch 'erikj/current_state_fix' into develop	Erik Johnston	2017-01-23	1	-1/+1
\|\ \ \
\| * \| \|	Typo	Erik Johnston	2017-01-23	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #1840 from matrix-org/erikj/current_state_fix	Erik Johnston	2017-01-23	5	-182/+163
\|\\| \| \| \| \| \| \| \| \| \| \|	Insert delta of current_state_events to be more efficient
\| * \| \|	Refactor to calculate state delta outside transaction	Erik Johnston	2017-01-23	1	-87/+118
\| \| \| \|
\| * \| \|	Comments	Erik Johnston	2017-01-20	1	-8/+19
\| \| \| \|
\| * \| \|	Insert delta of current_state_events to be more efficient	Erik Johnston	2017-01-20	5	-119/+58
\| \| \| \|
* \| \| \|	Merge pull request #1836 from matrix-org/erikj/current_state_fix	Erik Johnston	2017-01-20	5	-201/+217
\|\\| \| \| \| \| \| \| \| \| \| \|	Derive current_state_events from state groups
\| * \| \|	Spelling	Erik Johnston	2017-01-20	1	-1/+1
\| \| \| \|
\| * \| \|	Update all call sites after rename	Erik Johnston	2017-01-20	1	-1/+1
\| \| \| \|
\| * \| \|	Comments	Erik Johnston	2017-01-20	1	-0/+11
\| \| \| \|
\| * \| \|	Calculate the forward extremeties once	Erik Johnston	2017-01-20	2	-126/+92
\| \| \| \|
\| * \| \|	Derive current_state_events from state groups	Erik Johnston	2017-01-20	4	-99/+138
\| \| \| \|
* \| \| \|	Merge pull request #1837 from matrix-org/rav/fix_purge_media_doc	Richard van der Hoff	2017-01-20	1	-5/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	fix doc for purge_media_cache
\| * \| \| \|	fix doc for purge_media_cache	Richard van der Hoff	2017-01-20	1	-5/+3
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	purge_media_cache takes its arg from a query-param, not the POST body, for some reason.
* \| \| \|	Merge pull request #1835 from matrix-org/erikj/fix_workers	Erik Johnston	2017-01-20	1	-0/+10
\|\\| \| \| \| \| \| \| \| \| \| \|	Make worker listener config backwards compat
\| * \| \|	Make worker listener config backwards compat	Erik Johnston	2017-01-20	1	-0/+10
\| \| \| \|
* \| \| \|	Merge pull request #1832 from xsteadfastx/xsteadfastx/turn-username-password	David Baker	2017-01-19	2	-10/+25
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Added username and password for turn server
\| * \| \|	Added default config for turn username and password	Marvin Steadfast	2017-01-19	1	-0/+5
\| \| \| \|
\| * \| \|	Added username and password for turn server	Marvin Steadfast	2017-01-19	2	-10/+20
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	It makes it possible to use a turn server that needs a username and password instead of a token.
* \| \|	Merge pull request #1828 from matrix-org/erikj/iterable_cache_size	Erik Johnston	2017-01-18	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Update LruCache size estimate on clear
\| * \| \|	Update LruCache size estimate on clear	Erik Johnston	2017-01-18	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #1811 from aperezdc/unhardcode-riot-urls	David Baker	2017-01-18	2	-6/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Allow configuring the Riot URL used in notification emails
\| * \| \| \|	Allow configuring the Riot URL used in notification emails	Adrian Perez de Castro	2017-01-13	2	-6/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The URLs used for notification emails were hardcoded to use either matrix.to or vector.im; but for self-hosted setups where Riot is also self-hosted it may be desirable to allow configuring an alternative Riot URL. Fixes #1809. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
* \| \| \| \|	Merge pull request #1827 from matrix-org/dbkr/email_case_insensitive	David Baker	2017-01-18	2	-1/+12
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Lowercase all email addresses before querying db
\| * \| \| \|	Lowercase all email addresses before querying db	David Baker	2017-01-18	2	-1/+12
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we store all emails in the DB in lowercase (https://github.com/matrix-org/synapse/pull/1170)
* \| \| \|	Merge pull request #1823 from matrix-org/erikj/load_events_logs	Erik Johnston	2017-01-18	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove loading events logs
\| * \| \| \|	Lower loading events log to DEBUG	Erik Johnston	2017-01-17	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1824 from matrix-org/erikj/retry_host_log	Erik Johnston	2017-01-18	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Lower the not retrying host log line to debug
\| * \| \| \| \|	Lower the not retrying host log line to debug	Erik Johnston	2017-01-17	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #1822 from matrix-org/erikj/statE_logging	Erik Johnston	2017-01-18	3	-6/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Change resolve_state_groups call site logging to DEBUG
\| * \| \| \| \|	Change resolve_state_groups call site logging to DEBUG	Erik Johnston	2017-01-17	3	-6/+6
\| \|/ / / /
* \| \| \| \|	Merge pull request #1821 from matrix-org/erikj/cache_metrics_string_intern	Erik Johnston	2017-01-18	1	-3/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Measure metrics of string_cache