7 Commits

Author	SHA1	Message	Date
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
geffzhang	659d124780	reset sdk version	2017-02-12 15:50:21 +08:00
geffzhang	e1f16c2be1	add ratelimit acceptance test	2017-02-12 15:49:21 +08:00
geffzhang	9b06afc781	refactor ratelimit config	2017-02-11 20:52:20 +08:00
geffzhang	e1d5ef3aae	implement Request Rate limit, this feature is options	2017-02-11 16:32:30 +08:00
TomPallister	16801ec016	upgrade	2016-10-13 21:49:11 +01:00
TomPallister	c512a772d4	after hours of pissing around on the mac...gave up..so got this configured how i wanted in VS2015 now to see if it works on the mac	2016-07-03 20:39:08 +01:00