Philip Wood 28a41b21a4 Merge remote-tracking branch 'upstream/develop' into feature/AddStyleCopAnalyzers ...

# Conflicts:
#	test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
#	test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj

2018-03-03 12:33:04 +00:00

..

Properties

hacked together load balancing reroutes in fileconfig (#211)

2018-01-31 20:34:55 +00:00

AdministrationTests.cs

Feature/base url in config (#234)

2018-02-15 09:52:16 +00:00

appsettings.json

hacked together load balancing reroutes in fileconfig (#211)

2018-01-31 20:34:55 +00:00

BearerToken.cs

hacked together load balancing reroutes in fileconfig (#211)

2018-01-31 20:34:55 +00:00

configuration.json

Renamed ScopeName to ApiName, ScopeSecret to ApiSecret, and

2017-03-14 16:54:55 -04:00

idsrv3test.pfx

can now use tokens from ocelot a on ocelot b when using admin area

2017-06-23 15:17:40 +01:00

Ocelot.IntegrationTests.csproj

Add stylecop analyzers with default ruleset

2018-02-25 14:36:33 +00:00

peers.json

hacked together load balancing reroutes in fileconfig (#211)

2018-01-31 20:34:55 +00:00

RaftTests.cs

#245 ignored raft tests for now as a bit unstable

2018-02-26 08:56:37 +00:00

ThreadSafeHeadersTests.cs

Feature/base url in config (#234)

2018-02-15 09:52:16 +00:00