Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							4a9055d446 
							
						 
					 
					
						
						
							
							Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse  
						
						 
						
						
						
						
							
  v0.18.2
 
						
					 
					
						2016-11-01 13:14:04 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3c91c5b216 
							
						 
					 
					
						
						
							
							Bump version and changelog  
						
						 
						
						
						
						
							
						
					 
					
						2016-11-01 13:06:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f6e8019b9c 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2  
						
						 
						
						
						
						
							
						
					 
					
						2016-11-01 11:57:28 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							760469c812 
							
						 
					 
					
						
						
							
							Continue to clean up received_transactions  
						
						 
						
						
						
						
							
						
					 
					
						2016-11-01 11:42:08 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							47ed4d84bb 
							
						 
					 
					
						
						
							
							Merge pull request  #1187  from matrix-org/paul/metrics-howto  
						
						 
						
						... 
						
						
						
						Update documentation about exported prometheus metrics 
						
						
							
						
					 
					
						2016-10-31 18:33:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f09d2b692f 
							
						 
					 
					
						
						
							
							Removed unused stuff  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-31 17:10:56 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							4c3eb14d68 
							
						 
					 
					
						
						
							
							Increase batching of sent transaction inserts  
						
						 
						
						... 
						
						
						
						This should further reduce the number of individual inserts,
transactions and updates that are required for keeping sent_transactions
up to date. 
						
						
							
						
					 
					
						2016-10-31 16:07:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							1d4d518b50 
							
						 
					 
					
						
						
							
							Add details of renamed metrics  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-31 15:06:52 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							159434a133 
							
						 
					 
					
						
						
							
							Remove long-deprecated instructions about promethesus console; also fix for modern config file format  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-28 13:58:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							264f6c2a39 
							
						 
					 
					
						
						
							
							Changelog formattting  
						
						 
						
						
						
						
							
  v0.18.2-rc5
 
						
					 
					
						2016-10-28 11:19:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							82e71a259c 
							
						 
					 
					
						
						
							
							Bump changelog and version  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-28 11:16:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							490b97d3e7 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into release-v0.18.2  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-28 11:12:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							f9d5b60a24 
							
						 
					 
					
						
						
							
							Merge pull request  #1184  from matrix-org/paul/metrics  
						
						 
						
						... 
						
						
						
						Bugfix for process-wide metric export on split processes 
						
						
							
						
					 
					
						2016-10-27 18:27:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							1cc22da600 
							
						 
					 
					
						
						
							
							Set up the process collector during metrics __init__; that way all split-process workers have it  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-27 18:09:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							aac13b1f9a 
							
						 
					 
					
						
						
							
							Pass the Metrics group into the process collector instead of having it find its own one; this avoids it needing to import from synapse.metrics  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-27 18:08:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							ccc1a3d54d 
							
						 
					 
					
						
						
							
							Allow creation of a 'subspace' within a Metrics object, returning another one  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-27 18:07:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							665e53524e 
							
						 
					 
					
						
						
							
							Bump changelog and version  
						
						 
						
						
						
						
							
  v0.18.2-rc4
 
						
					 
					
						2016-10-27 14:52:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e438699c59 
							
						 
					 
					
						
						
							
							Merge pull request  #1183  from matrix-org/erikj/fix_email_update  
						
						 
						
						... 
						
						
						
						Fix user_threepids schema delta 
						
						
							
						
					 
					
						2016-10-27 14:48:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a9111786f9 
							
						 
					 
					
						
						
							
							Use most recently added binding, not most recently seen user.  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-27 14:32:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							1fc1bc2a51 
							
						 
					 
					
						
						
							
							Fix user_threepids schema delta  
						
						 
						
						... 
						
						
						
						The delta `37/user_threepids.sql` aimed to update all the email
addresses to be lower case, however duplicate emails may exist in the
table already.
This commit adds a step where the delta moves the duplicate emails to a
new `medium` `email_old`. Only the most recently used account keeps the
binding intact. We move rather than delete so that we retain some record
of which emails were associated with which account. 
						
						
							
						
					 
					
						2016-10-27 14:14:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							db0609f1ec 
							
						 
					 
					
						
						
							
							Update changelog  
						
						 
						
						
						
						
							
  v0.18.2-rc3
 
						
					 
					
						2016-10-27 11:13:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							ab731d8f8e 
							
						 
					 
					
						
						
							
							Bump changelog and version  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-27 11:07:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							45bdacd9a7 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.18.2  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-27 11:02:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							177f104432 
							
						 
					 
					
						
						
							
							Merge pull request  #1098  from matrix-org/markjh/bearer_token  
						
						 
						
						... 
						
						
						
						Allow clients to supply access_tokens as headers 
						
						
							
						
					 
					
						2016-10-25 17:33:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							22fbf86e4f 
							
						 
					 
					
						
						
							
							Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-25 15:09:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f138bb40e2 
							
						 
					 
					
						
						
							
							Fixup change log  
						
						 
						
						
						
						
							
  v0.18.2-rc2
 
						
					 
					
						2016-10-25 11:23:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							855645c719 
							
						 
					 
					
						
						
							
							Bump version and changelog  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-25 11:16:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							25423f50aa 
							
						 
					 
					
						
						
							
							Merge pull request  #1179  from matrix-org/erikj/typing_timer_paranoia  
						
						 
						
						... 
						
						
						
						Fix infinite typing bug 
						
						
							
						
					 
					
						2016-10-25 10:59:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							2ef617bc06 
							
						 
					 
					
						
						
							
							Fix infinite typing bug  
						
						 
						
						... 
						
						
						
						There's a bug somewhere that causes typing notifications to not be timed
out properly. By adding a paranoia timer and using correct inequalities
notifications should stop being stuck, even if it the root cause hasn't
been fixed. 
						
						
							
						
					 
					
						2016-10-24 15:51:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e83a08d795 
							
						 
					 
					
						
						
							
							Merge pull request  #1178  from matrix-org/erikj/current_room_token  
						
						 
						
						... 
						
						
						
						Fix incredibly slow back pagination query 
						
						
							
						
					 
					
						2016-10-24 13:58:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							b6800a8ecd 
							
						 
					 
					
						
						
							
							Actually use the new function  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-24 13:39:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							d04e2ff3a4 
							
						 
					 
					
						
						
							
							Fix incredubly slow back pagination query  
						
						 
						
						... 
						
						
						
						If a client didn't specify a from token when paginating backwards
synapse would attempt to query the (global) maximum topological token.
This a) doesn't make much sense since they're room specific and b) there
are no indices that lets postgres do this efficiently. 
						
						
							
						
					 
					
						2016-10-24 13:35:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							a842fed418 
							
						 
					 
					
						
						
							
							Merge pull request  #1177  from matrix-org/paul/standard-metric-names  
						
						 
						
						... 
						
						
						
						Standardise prometheus metrics 
						
						
							
						
					 
					
						2016-10-21 13:06:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							e01a1bc92d 
							
						 
					 
					
						
						
							
							Merge pull request  #1175  from matrix-org/luke/feature-configurable-as-rate-limiting  
						
						 
						
						... 
						
						
						
						Allow Configurable Rate Limiting Per AS 
						
						
							
						
					 
					
						2016-10-20 16:21:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							6fdd31915b 
							
						 
					 
					
						
						
							
							Style  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-20 13:53:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							07caa749bf 
							
						 
					 
					
						
						
							
							Closing brace on following line  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-20 12:07:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							f09db236b1 
							
						 
					 
					
						
						
							
							as_user->app_service, less redundant comments, better positioned comments  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-20 12:04:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							8bfd01f619 
							
						 
					 
					
						
						
							
							flake8  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-20 11:52:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luke Barnard 
							
						 
					 
					
						
						
						
						
							
						
						
							1b17d1a106 
							
						 
					 
					
						
						
							
							Use real AS object by passing it through the requester  
						
						 
						
						... 
						
						
						
						This means synapse does not have to check if the AS is interested, but instead it effectively re-uses what it already knew about the requesting user 
						
						
							
						
					 
					
						2016-10-20 11:43:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							b01aaadd48 
							
						 
					 
					
						
						
							
							Split callback metric lambda functions down onto their own lines to keep line lengths under 90  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 18:26:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							1071c7d963 
							
						 
					 
					
						
						
							
							Adjust code for <100 char line limit  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 18:23:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							6453d03edd 
							
						 
					 
					
						
						
							
							Cut the raw /proc/self/stat line up into named fields at collection time  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 18:21:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							3ae48a1f99 
							
						 
					 
					
						
						
							
							Move the process metrics collector code into its own file  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 18:10:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							4cedd53224 
							
						 
					 
					
						
						
							
							A slightly neater way to manage metric collector functions  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 17:54:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							5663137e03 
							
						 
					 
					
						
						
							
							appease pep8  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 16:09:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							b202531be6 
							
						 
					 
					
						
						
							
							Also guard /proc/self/fds-related code with a suitable psuedoconstant  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 15:37:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							1b179455fc 
							
						 
					 
					
						
						
							
							Guard registration of process-wide metrics by existence of the requisite /proc entries  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 15:34:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							981f852d54 
							
						 
					 
					
						
						
							
							Add standard process_start_time_seconds metric  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 15:05:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							def63649df 
							
						 
					 
					
						
						
							
							Add standard process_max_fds metric  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 15:05:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul "LeoNerd" Evans 
							
						 
					 
					
						
						
						
						
							
						
						
							06f1ad1625 
							
						 
					 
					
						
						
							
							Add standard process_open_fds metric  
						
						 
						
						
						
						
							
						
					 
					
						2016-10-19 15:05:21 +01:00