TomPallister
							
						 
					 | 
					
						
						
							
						
						6f65d9bab0
					 | 
					
						
						
							
							upgraded to vs2017
						
						
						
						
						
						
					 | 
					
						2017-03-09 17:00:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tom.pallister
							
						 
					 | 
					
						
						
							
						
						f443575185
					 | 
					
						
						
							
							thread safe test passing on windows
						
						
						
						
						
						
					 | 
					
						2017-03-06 13:24:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						f0dcefff38
					 | 
					
						
						
							
							test fails on my mac..
						
						
						
						
						
						
					 | 
					
						2017-03-06 07:34:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						fac2346161
					 | 
					
						
						
							
							added thread safe test
						
						
						
						
						
						
					 | 
					
						2017-03-06 07:33:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						c787202374
					 | 
					
						
						
							
							I realised we can get rid of the cookie container as cookies are just sent as a header called cookie...
						
						
						
						
						
						
					 | 
					
						2017-03-05 18:05:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						558a0dfdab
					 | 
					
						
						
							
							finished refactoring config cretor
						
						
						
						
						
						
					 | 
					
						2017-03-05 16:56:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						8bbd781820
					 | 
					
						
						
							
							updated file options
						
						
						
						
						
						
					 | 
					
						2017-03-02 09:18:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						b44c02510a
					 | 
					
						
						
							
							unit test for qos
						
						
						
						
						
						
					 | 
					
						2017-03-01 23:34:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						0a2d7a6922
					 | 
					
						
						
							
							qos options creator in own class
						
						
						
						
						
						
					 | 
					
						2017-03-01 23:28:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						6661cb5f32
					 | 
					
						
						
							
							use config tests
						
						
						
						
						
						
					 | 
					
						2017-03-01 23:15:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						034732ce90
					 | 
					
						
						
							
							added lame test for service config creator
						
						
						
						
						
						
					 | 
					
						2017-03-01 23:12:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						fff743ccf8
					 | 
					
						
						
							
							pulling out service config cretor
						
						
						
						
						
						
					 | 
					
						2017-03-01 12:42:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						d4119ab33d
					 | 
					
						
						
							
							extracted thing that creates request id key
						
						
						
						
						
						
					 | 
					
						2017-03-01 08:11:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						c85ea41951
					 | 
					
						
						
							
							refactoring ocelot config creation process
						
						
						
						
						
						
					 | 
					
						2017-03-01 07:54:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						d33e0c6f3b
					 | 
					
						
						
							
							merged develop and stolen binarymash dont publish unstable build script code
						
						
						
						
						
						
					 | 
					
						2017-02-25 18:27:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						be24f9a9ca
					 | 
					
						
						
							
							Added base url finder for when nothing set in Program.cs
						
						
						
						
						
						
					 | 
					
						2017-02-25 17:02:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						07c334cc98
					 | 
					
						
						
							
							moved stuff around so a bit less crap
						
						
						
						
						
						
					 | 
					
						2017-02-25 16:09:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						112a9c303e
					 | 
					
						
						
							
							hacky auth working
						
						
						
						
						
						
					 | 
					
						2017-02-24 19:52:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						bd07af6926
					 | 
					
						
						
							
							more work towards getting identity server and admin area set up
						
						
						
						
						
						
					 | 
					
						2017-02-22 22:13:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						aa0d8fe59a
					 | 
					
						
						
							
							all tests passing, now to do authentication config provider
						
						
						
						
						
						
					 | 
					
						2017-02-22 07:48:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						bf90b12f2c
					 | 
					
						
						
							
							acceptance tests passing after fixing registrations
						
						
						
						
						
						
					 | 
					
						2017-02-21 07:39:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						2dfdf0bb86
					 | 
					
						
						
							
							after much hacking unit tests passing
						
						
						
						
						
						
					 | 
					
						2017-02-21 07:34:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						eb5dfc6975
					 | 
					
						
						
							
							removed test configuration nonsense
						
						
						
						
						
						
					 | 
					
						2017-02-19 15:43:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						d548a86327
					 | 
					
						
						
							
							Added integration test project as acceptance style doesnt work when running the new admin area because identityserver needs to use proper networking
						
						
						
						
						
						
					 | 
					
						2017-02-19 15:29:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philip Wood
							
						 
					 | 
					
						
						
							
						
						3c9ad87b73
					 | 
					
						
						
							
							Fix cake on Mac. Also added compile-time support for OSX.10.12-x64. The acceptance tests still fail on this version of OS X, however, because of the funky stuff going on in TestConfiguration.cs. Fixing this is outside the scope of this issue.
						
						
						
						
						
						
					 | 
					
						2017-02-19 15:03:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						d236ed3018
					 | 
					
						
						
							
							trying to get identity server authing
						
						
						
						
						
						
					 | 
					
						2017-02-19 13:59:17 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						fa47663259
					 | 
					
						
						
							
							changed file config stuff to just use app base directory
						
						
						
						
						
						
					 | 
					
						2017-02-19 12:58:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						816221c7a6
					 | 
					
						
						
							
							morehaking about
						
						
						
						
						
						
					 | 
					
						2017-02-19 12:33:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						b98310c80d
					 | 
					
						
						
							
							working ssl example
						
						
						
						
						
						
					 | 
					
						2017-02-17 18:24:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						4dac8cb4fb
					 | 
					
						
						
							
							still hacking around
						
						
						
						
						
						
					 | 
					
						2017-02-17 07:27:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						219b45e7d0
					 | 
					
						
						
							
							updated acceptance test assertion
						
						
						
						
						
						
					 | 
					
						2017-02-15 07:51:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						8ae8e2d834
					 | 
					
						
						
							
							added acceptance test for calling reroutes controller
						
						
						
						
						
						
					 | 
					
						2017-02-15 07:48:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						f302ee77bf
					 | 
					
						
						
							
							remove bak file
						
						
						
						
						
						
					 | 
					
						2017-02-15 08:54:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						0aad1f8fa0
					 | 
					
						
						
							
							Merge remote-tracking branch 'refs/remotes/origin/develop' into RateLimit
						
						
						
						
						
						
						
						# Conflicts:
#	src/Ocelot/Configuration/Builder/ReRouteBuilder.cs
#	src/Ocelot/Configuration/Creator/FileOcelotConfigurationCreator.cs
#	src/Ocelot/Configuration/QoSOptions.cs
#	src/Ocelot/Configuration/ReRoute.cs
#	test/Ocelot.AcceptanceTests/configuration.json 
						
						
					 | 
					
						2017-02-15 08:49:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						ef3deec8da
					 | 
					
						
						
							
							more hacking
						
						
						
						
						
						
					 | 
					
						2017-02-13 19:14:49 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						159969483b
					 | 
					
						
						
							
							hacking away
						
						
						
						
						
						
					 | 
					
						2017-02-13 18:51:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						95fc687e93
					 | 
					
						
						
							
							started messing around with admin area
						
						
						
						
						
						
					 | 
					
						2017-02-13 12:13:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						0b830d9891
					 | 
					
						
						
							
							mapped admin path works for manual test
						
						
						
						
						
						
					 | 
					
						2017-02-13 07:42:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						2fa6e66dd4
					 | 
					
						
						
							
							refactor code
						
						
						
						
						
						
					 | 
					
						2017-02-13 08:29:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						e1f16c2be1
					 | 
					
						
						
							
							add ratelimit  acceptance test
						
						
						
						
						
						
					 | 
					
						2017-02-12 15:49:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						286c7f8488
					 | 
					
						
						
							
							Fixed issue where qos was being created for each request so circuit breaker was never stopping traffic going to downstream service.
						
						
						
						
						
						
					 | 
					
						2017-02-11 18:56:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						820673dda8
					 | 
					
						
						
							
							added docs but qos acceptance test not working seems circuit never opens but not sure if it is meant to with timeouts..investigating
						
						
						
						
						
						
					 | 
					
						2017-02-11 15:11:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						ce8da4c92d
					 | 
					
						
						
							
							removed qos by accident, added back in
						
						
						
						
						
						
					 | 
					
						2017-02-11 13:14:25 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						9b06afc781
					 | 
					
						
						
							
							refactor ratelimit config
						
						
						
						
						
						
					 | 
					
						2017-02-11 20:52:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						e33fe4cf7d
					 | 
					
						
						
							
							merged develop
						
						
						
						
						
						
					 | 
					
						2017-02-11 12:07:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						e1d5ef3aae
					 | 
					
						
						
							
							implement Request Rate limit, this feature is options
						
						
						
						
						
						
					 | 
					
						2017-02-11 16:32:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						18e0f40c95
					 | 
					
						
						
							
							Fix should_use_global_request_id_and_forward not pass
						
						
						
						
						
						
						
						This test needs UpstreamHttpMethod = "Get", 
						
						
					 | 
					
						2017-02-09 08:30:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						0b9faca295
					 | 
					
						
						
							
							merged develop
						
						
						
						
						
						
					 | 
					
						2017-02-08 18:52:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						f7fe7c0f49
					 | 
					
						
						
							
							more refactoring
						
						
						
						
						
						
					 | 
					
						2017-02-08 18:47:35 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						dbe28d38bc
					 | 
					
						
						
							
							tidying up configuration creation
						
						
						
						
						
						
					 | 
					
						2017-02-08 07:37:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |