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

..

Authentication

more refactoring

2017-02-08 18:47:35 +00:00

Authorization

changed upstream http method to use httpmethod class in .net

2017-02-07 18:30:21 +00:00

Cache

changed upstream http method to use httpmethod class in .net

2017-02-07 18:30:21 +00:00

Claims

changed upstream http method to use httpmethod class in .net

2017-02-07 18:30:21 +00:00

Configuration

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

DownstreamRouteFinder

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

DownstreamUrlCreator

changed upstream http method to use httpmethod class in .net

2017-02-07 18:30:21 +00:00

Headers

changed upstream http method to use httpmethod class in .net

2017-02-07 18:30:21 +00:00

Infrastructure

Added some basic cache stuff

2016-11-04 15:05:59 +00:00

LoadBalancer

merged develop

2017-02-11 12:07:08 +00:00

Properties

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

QueryStrings

changed upstream http method to use httpmethod class in .net

2017-02-07 18:30:21 +00:00

RateLimit

Merge remote-tracking branch 'refs/remotes/origin/develop' into RateLimit

2017-02-15 08:49:40 +08:00

Repository

added benchmarks back in, renamed data repository and a few other things

2016-10-24 19:32:52 +01:00

Request

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

Requester

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

RequestId

changed upstream http method to use httpmethod class in .net

2017-02-07 18:30:21 +00:00

Responder

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

ServiceDiscovery

merged develop

2017-02-11 12:07:08 +00:00

Ocelot.UnitTests.xproj

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

project.json

refactor code

2017-02-13 08:29:29 +08:00