Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							efe8126290 
							
						 
					 
					
						
						
							
							Merge pull request  #846  from matrix-org/markjh/user_joined_notifier  
						
						... 
						
						
						
						Notify users for events in rooms they join. 
						
						
							
						
					 
					
						2016-06-07 11:43:49 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							88625db05f 
							
						 
					 
					
						
						
							
							Notify users for events in rooms they join.  
						
						... 
						
						
						
						Change how the notifier updates the map from room_id to user streams on
receiving a join event. Make it update the map when it notifies for the
join event, rather than using the "user_joined_room" distributor signal 
						
						
							
						
					 
					
						2016-06-07 11:33:36 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							84379062f9 
							
						 
					 
					
						
						
							
							Fix AS retries, but with correct ordering  
						
						
						
						
							
						
					 
					
						2016-06-07 10:24:50 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							310197bab5 
							
						 
					 
					
						
						
							
							Fix AS retries  
						
						
						
						
							
						
					 
					
						2016-06-07 09:34:50 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							b0932b34cb 
							
						 
					 
					
						
						
							
							Merge pull request  #845  from matrix-org/markjh/synchrotron_presence  
						
						... 
						
						
						
						Fix a KeyError in the synchrotron presence 
						
						
							
						
					 
					
						2016-06-06 16:52:27 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							4a5bbb1941 
							
						 
					 
					
						
						
							
							Fix a KeyError in the synchrotron presence  
						
						
						
						
							
						
					 
					
						2016-06-06 16:37:12 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							87f60e7053 
							
						 
					 
					
						
						
							
							Merge pull request  #844  from matrix-org/markjh/yield_on_sleep  
						
						... 
						
						
						
						Yield on the sleeps intended to backoff replication 
						
						
							
						
					 
					
						2016-06-06 16:20:54 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							5ef84da4f1 
							
						 
					 
					
						
						
							
							Yield on the sleeps intended to backoff replication  
						
						
						
						
							
						
					 
					
						2016-06-06 16:05:28 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							216a05b3e3 
							
						 
					 
					
						
						
							
							.values() returns list of sets  
						
						
						
						
							
						
					 
					
						2016-06-06 16:00:09 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							9f715573aa 
							
						 
					 
					
						
						
							
							Merge pull request  #842  from matrix-org/erikj/presence_timer  
						
						... 
						
						
						
						Fire after 30s not 8h 
						
						
							
						
					 
					
						2016-06-06 15:51:23 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							96dc600579 
							
						 
					 
					
						
						
							
							Fix typos  
						
						
						
						
							
						
					 
					
						2016-06-06 15:44:41 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							377eb480ca 
							
						 
					 
					
						
						
							
							Fire after 30s not 8h  
						
						
						
						
							
						
					 
					
						2016-06-06 15:14:21 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							e4134c5e13 
							
						 
					 
					
						
						
							
							Merge pull request  #841  from matrix-org/erikj/event_counter  
						
						... 
						
						
						
						Add metric counter for number of persisted events 
						
						
							
						
					 
					
						2016-06-06 14:17:40 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							778c1fea8b 
							
						 
					 
					
						
						
							
							Merge pull request  #840  from matrix-org/erikj/event_write_through  
						
						... 
						
						
						
						Add events to cache when we persist them 
						
						
							
						
					 
					
						2016-06-06 14:17:35 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							7aa778fba9 
							
						 
					 
					
						
						
							
							Add metric counter for number of persisted events  
						
						
						
						
							
						
					 
					
						2016-06-06 11:58:09 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							70aee0717c 
							
						 
					 
					
						
						
							
							Add events to cache when we persist them  
						
						
						
						
							
						
					 
					
						2016-06-06 11:34:53 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3210f4c385 
							
						 
					 
					
						
						
							
							Merge pull request  #836  from matrix-org/erikj/change_event_cache  
						
						... 
						
						
						
						Change the way we cache events 
						
						
							
						
					 
					
						2016-06-03 18:47:46 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							040a560a48 
							
						 
					 
					
						
						
							
							Merge pull request  #837  from matrix-org/markjh/synchrotron_presence_list  
						
						... 
						
						
						
						Add get_presence_list_accepted to the broken caches in synchrotron 
						
						
							
						
					 
					
						2016-06-03 18:28:08 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							cffe46408f 
							
						 
					 
					
						
						
							
							Don't rely on options when inserting event into cache  
						
						
						
						
							
						
					 
					
						2016-06-03 18:25:21 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							ac9716f154 
							
						 
					 
					
						
						
							
							Fix spelling  
						
						
						
						
							
						
					 
					
						2016-06-03 18:10:00 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							8f79084bd4 
							
						 
					 
					
						
						
							
							Add get_presence_list_accepted to the broken caches in synchrotron  
						
						
						
						
							
						
					 
					
						2016-06-03 18:03:40 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							10ea3f46ba 
							
						 
					 
					
						
						
							
							Change the way we cache events  
						
						
						
						
							
						
					 
					
						2016-06-03 17:57:50 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							f6be734be9 
							
						 
					 
					
						
						
							
							Merge pull request  #835  from matrix-org/erikj/get_event_txn  
						
						... 
						
						
						
						Remove event fetching from DB threads 
						
						
							
						
					 
					
						2016-06-03 17:30:00 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							05e01f21d7 
							
						 
					 
					
						
						
							
							Remove event fetching from DB threads  
						
						
						
						
							
						
					 
					
						2016-06-03 17:22:13 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							81d226888f 
							
						 
					 
					
						
						
							
							Merge pull request  #834  from matrix-org/dbkr/fix_email_from  
						
						... 
						
						
						
						Fix email notif From 
						
						
							
						
					 
					
						2016-06-03 16:54:29 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							72c4d482e9 
							
						 
					 
					
						
						
							
							3rd time lucky: we'd already calculated it above  
						
						
						
						
							
						
					 
					
						2016-06-03 16:39:50 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							fbf608decb 
							
						 
					 
					
						
						
							
							Oops, we're using the dict form  
						
						
						
						
							
						
					 
					
						2016-06-03 16:38:39 +01:00 
						 
				 
			
				
					
						
							
							
								David Baker 
							
						 
					 
					
						
						
						
						
							
						
						
							06d40c8b98 
							
						 
					 
					
						
						
							
							Add substitutions to email notif From  
						
						
						
						
							
						
					 
					
						2016-06-03 16:31:23 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							5f88549f4a 
							
						 
					 
					
						
						
							
							Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop  
						
						
						
						
							
						
					 
					
						2016-06-03 16:27:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							ca457f594e 
							
						 
					 
					
						
						
							
							Merge pull request  #831  from matrix-org/markjh/synchrotronII  
						
						... 
						
						
						
						Add a separate process that can handle /sync requests 
						
						
							
						
					 
					
						2016-06-03 16:06:25 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							c11614bcdc 
							
						 
					 
					
						
						
							
							Note that v0.15.x was never released  
						
						
						
						
							
 
						
					 
					
						2016-06-03 15:50:15 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							21961c93c7 
							
						 
					 
					
						
						
							
							Bump changelog and version  
						
						
						
						
							
						
					 
					
						2016-06-03 15:33:14 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							48340e4f13 
							
						 
					 
					
						
						
							
							Clear the list of ongoing syncs on shutdown  
						
						
						
						
							
						
					 
					
						2016-06-03 15:02:27 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							fcbc282f56 
							
						 
					 
					
						
						
							
							Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into release-v0.16.0  
						
						
						
						
							
						
					 
					
						2016-06-03 15:02:04 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							51773bcbaf 
							
						 
					 
					
						
						
							
							Merge pull request  #832  from matrix-org/erikj/presence_coount  
						
						... 
						
						
						
						Change def of small delta in presence stream. Add metrics. 
						
						
							
						
					 
					
						2016-06-03 14:57:00 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							da491e75b2 
							
						 
					 
					
						
						
							
							Appease flake8  
						
						
						
						
							
						
					 
					
						2016-06-03 14:56:36 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							0b3c80a234 
							
						 
					 
					
						
						
							
							Use ClientIpStore to record client ips  
						
						
						
						
							
						
					 
					
						2016-06-03 14:55:01 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							dd6f62ed99 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into markjh/synchrotronII  
						
						
						
						
							
						
					 
					
						2016-06-03 14:51:33 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							c367ba5dd2 
							
						 
					 
					
						
						
							
							Merge pull request  #833  from matrix-org/markjh/client_ips  
						
						... 
						
						
						
						Move insert_client_ip to a separate class 
						
						
							
						
					 
					
						2016-06-03 14:51:03 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							eef541a291 
							
						 
					 
					
						
						
							
							Move insert_client_ip to a separate class  
						
						
						
						
							
						
					 
					
						2016-06-03 14:42:35 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							80aade3805 
							
						 
					 
					
						
						
							
							Send updates to the syncing users every ten seconds or immediately if they've just come online  
						
						
						
						
							
						
					 
					
						2016-06-03 14:24:19 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							ab116bdb0c 
							
						 
					 
					
						
						
							
							Fix typo  
						
						
						
						
							
						
					 
					
						2016-06-03 14:03:42 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							4ce84a1acd 
							
						 
					 
					
						
						
							
							Change metric style  
						
						
						
						
							
						
					 
					
						2016-06-03 13:49:16 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							a7ff5a1770 
							
						 
					 
					
						
						
							
							Presence metrics. Change def of small delta  
						
						
						
						
							
						
					 
					
						2016-06-03 13:40:55 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6fab0cc2 
							
						 
					 
					
						
						
							
							Merge pull request  #822  from matrix-org/matthew/brand-from-header  
						
						... 
						
						
						
						brand the email from header 
						
						
							
						
					 
					
						2016-06-03 12:15:01 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Hodgson 
							
						 
					 
					
						
						
						
						
							
						
						
							8d740132f4 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into matthew/brand-from-header  
						
						
						
						
							
						
					 
					
						2016-06-03 12:14:18 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							3b096c5f5c 
							
						 
					 
					
						
						
							
							Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop  
						
						
						
						
							
						
					 
					
						2016-06-03 12:00:33 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							43b7f371f5 
							
						 
					 
					
						
						
							
							Merge pull request  #830  from matrix-org/erikj/metrics_perf  
						
						... 
						
						
						
						Change CacheMetrics to be quicker 
						
						
							
						
					 
					
						2016-06-03 11:57:29 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Haines 
							
						 
					 
					
						
						
						
						
							
						
						
							abb151f3c9 
							
						 
					 
					
						
						
							
							Add a separate process that can handle /sync requests  
						
						
						
						
							
						
					 
					
						2016-06-03 11:57:26 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Johnston 
							
						 
					 
					
						
						
						
						
							
						
						
							4982b28868 
							
						 
					 
					
						
						
							
							Merge pull request  #829  from matrix-org/erikj/poke_notifier  
						
						... 
						
						
						
						Poke notifier on next reactor tick 
						
						
							
						
					 
					
						2016-06-03 11:52:10 +01:00