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
							
						 
					 | 
					
						
						
							
						
						112a9c303e
					 | 
					
						
						
							
							hacky auth working
						
						
						
						
						
						
					 | 
					
						2017-02-24 19:52:48 +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
							
						 
					 | 
					
						
						
							
						
						2dfdf0bb86
					 | 
					
						
						
							
							after much hacking unit tests passing
						
						
						
						
						
						
					 | 
					
						2017-02-21 07:34:47 +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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						4dac8cb4fb
					 | 
					
						
						
							
							still hacking around
						
						
						
						
						
						
					 | 
					
						2017-02-17 07:27:49 +00: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
							
						 
					 | 
					
						
						
							
						
						95fc687e93
					 | 
					
						
						
							
							started messing around with admin area
						
						
						
						
						
						
					 | 
					
						2017-02-13 12:13:53 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						caae826d77
					 | 
					
						
						
							
							Refactor qos as options
						
						
						
						
						
						
					 | 
					
						2017-02-08 09:25:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						7fffc9827a
					 | 
					
						
						
							
							auth options builders
						
						
						
						
						
						
					 | 
					
						2017-02-07 20:30:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						33ce162693
					 | 
					
						
						
							
							changed upstream http method to use httpmethod class in .net
						
						
						
						
						
						
					 | 
					
						2017-02-07 18:30:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						bbb808eb51
					 | 
					
						
						
							
							fixed failing tests
						
						
						
						
						
						
					 | 
					
						2017-02-07 13:46:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						a895fdfc12
					 | 
					
						
						
							
							Merge branch 'develop' into CircuitBreakerPattern
						
						
						
						
						
						
					 | 
					
						2017-02-07 18:41:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						6ad27ec17d
					 | 
					
						
						
							
							made upstream template use template path object
						
						
						
						
						
						
					 | 
					
						2017-02-07 07:54:03 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						1671fadea3
					 | 
					
						
						
							
							made upstream template use template path object
						
						
						
						
						
						
					 | 
					
						2017-02-07 07:53:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						b4ef277c3e
					 | 
					
						
						
							
							added builder for service provider config
						
						
						
						
						
						
					 | 
					
						2017-02-07 07:50:23 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						0a66051b92
					 | 
					
						
						
							
							removed some code we dont need as not expecting any errors so should just throw an exception to the global handler
						
						
						
						
						
						
					 | 
					
						2017-02-06 21:47:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						a4495b8fa9
					 | 
					
						
						
							
							tests for error handling on load balancing middleware
						
						
						
						
						
						
					 | 
					
						2017-02-06 20:22:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						932bcb73d4
					 | 
					
						
						
							
							wip: removed some debug statements and all tests passing on my PC...feel there is something wrong with the service discovery test around task execution not completing
						
						
						
						
						
						
					 | 
					
						2017-02-05 21:21:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						fb0f101732
					 | 
					
						
						
							
							wip fake consul provider
						
						
						
						
						
						
					 | 
					
						2017-02-05 21:08:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						c46dcc05b8
					 | 
					
						
						
							
							started implementing the consul service provider
						
						
						
						
						
						
					 | 
					
						2017-02-04 13:16:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						7900aa3f49
					 | 
					
						
						
							
							got sidetracked and downgraded to .net core app 1.1 that actually exists no idea why i had 1.4 :(
						
						
						
						
						
						
					 | 
					
						2017-02-04 12:06:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						9828c3b427
					 | 
					
						
						
							
							started adding consul acceptance test
						
						
						
						
						
						
					 | 
					
						2017-02-03 22:50:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								tom.pallister
							
						 
					 | 
					
						
						
							
						
						b0ff2fd317
					 | 
					
						
						
							
							fixed failing tests
						
						
						
						
						
						
					 | 
					
						2017-02-03 13:02:51 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						f285b0e0ad
					 | 
					
						
						
							
							plugged load balancer middleware into Ocelot pipeline, load balanced downstream host and port now used by url creator middleware
						
						
						
						
						
						
					 | 
					
						2017-02-03 08:00:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						aef6507da3
					 | 
					
						
						
							
							fixed failing tests after service discovery changes
						
						
						
						
						
						
					 | 
					
						2017-02-03 07:43:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								geffzhang
							
						 
					 | 
					
						
						
							
						
						883be802b3
					 | 
					
						
						
							
							Refactor CircuitBreaker Pattern
						
						
						
						
						
						
						
						Add Qos Config in ReRoute And Refactor CircuitBreakingDelegatingHandler 
						
						
					 | 
					
						2017-02-03 14:49:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						f2c6d1c799
					 | 
					
						
						
							
							load balancer middle ware test and cake mac osx build script
						
						
						
						
						
						
					 | 
					
						2017-02-02 22:34:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						07ca7989b0
					 | 
					
						
						
							
							more work towards getting service discovery working with load balancing
						
						
						
						
						
						
					 | 
					
						2017-02-02 21:34:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						37aaeeed82
					 | 
					
						
						
							
							added houses
						
						
						
						
						
						
					 | 
					
						2017-02-02 08:00:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						074ae4d609
					 | 
					
						
						
							
							started adding a load balancer house (terrible name?)
						
						
						
						
						
						
					 | 
					
						2017-02-01 22:30:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								TomPallister
							
						 
					 | 
					
						
						
							
						
						2aa156d0a6
					 | 
					
						
						
							
							refactoring service discovery and load balancing approach into load balancing middleware
						
						
						
						
						
						
					 | 
					
						2017-02-01 22:00:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						24dbb958e3
					 | 
					
						
						
							
							plying around with service providers
						
						
						
						
						
						
					 | 
					
						2017-02-01 19:34:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						0e92976df8
					 | 
					
						
						
							
							playing around with lb factory
						
						
						
						
						
						
					 | 
					
						2017-02-01 06:40:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						4a43accc46
					 | 
					
						
						
							
							implementing load balancers
						
						
						
						
						
						
					 | 
					
						2017-01-29 09:41:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philip Wood
							
						 
					 | 
					
						
						
							
						
						2cd69d1908
					 | 
					
						
						
							
							#20 - added cake build to do same functionality as batch scripts. Also does semver versioning of assemblies, if running in AppVeyor, generates release notes and publishes packages to appveyor.
						
						
						
						
						
						
					 | 
					
						2017-01-24 21:11:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Gardham-Pallister
							
						 
					 | 
					
						
						
							
						
						c3a47f66c8
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2017-01-23 12:13:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |