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
|
c966227ea9
|
Merge pull request #9 from TomPallister/develop
Merge Newest code
|
2017-02-15 07:13:21 +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
|
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 |
|
Tom Pallister
|
dc8106c904
|
Merge pull request #39 from TomPallister/feature/qos-documentation
Feature/qos documentation
|
2017-02-11 19:01:52 +00: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 |
|
Tom Pallister
|
aa709748db
|
Merge pull request #33 from TomPallister/feature/publish-unable-and-symbols
Feature/publish unable and symbols
|
2017-02-11 12:42:07 +00:00 |
|
TomPallister
|
2757fe25eb
|
made changes to only push nuget package for some reason still trying to push symbols again
|
2017-02-11 12:29:07 +00:00 |
|
TomPallister
|
ee73d3897c
|
removed second publish of symols as we publish with the nuget package
|
2017-02-11 12:18:27 +00:00 |
|
Tom Pallister
|
04fb12d1ac
|
Merge pull request #31 from TomPallister/feature/use-service-provider-config-builder
Feature/use service provider config builder
|
2017-02-11 12:11:01 +00: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
|
08c9700a4a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
|
2017-02-10 23:19:17 +08:00 |
|
geffzhang
|
9267918270
|
Merge pull request #7 from TomPallister/master
Master
|
2017-02-10 07:09:14 +08:00 |
|
geffzhang
|
bc5f284afa
|
Merge pull request #6 from TomPallister/develop
Merge CircuitBreakerPattern
|
2017-02-10 07:05:24 +08:00 |
|
Tom Pallister
|
ce83c7dfff
|
Merge pull request #27 from geffzhang/CircuitBreakerPattern
Circuit breaker pattern
|
2017-02-09 19:32:23 +00: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
|
48a62382fe
|
changes missed
|
2017-02-08 18:53:52 +00: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
|
9d790a449b
|
more refactoring of fileconfig creator
|
2017-02-08 18:23:07 +00:00 |
|
Tom Gardham-Pallister
|
26ac0fd3f4
|
more refactoring
|
2017-02-08 07:49:50 +00:00 |
|
Tom Gardham-Pallister
|
dbe28d38bc
|
tidying up configuration creation
|
2017-02-08 07:37:04 +00:00 |
|
geffzhang
|
78ff96375e
|
Merge branch 'develop' into CircuitBreakerPattern
|
2017-02-08 09:32:00 +08: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 |
|
TomPallister
|
d2a31d0cc5
|
Merge branch 'release/1.3.0'
|
2017-02-07 20:21:51 +00:00 |
|
Tom Pallister
|
c909aa2ea1
|
Merge pull request #30 from TomPallister/feature/testing-release-process
test commit
|
2017-02-07 20:09:53 +00:00 |
|
TomPallister
|
c839c17c62
|
test commit
|
2017-02-07 20:04:08 +00:00 |
|
TomPallister
|
ca9b4b94f4
|
Merge branch 'release/1.1.1'
|
2017-02-07 19:44:55 +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
|
616ca4f730
|
update sdk version
|
2017-02-07 19:50:09 +08:00 |
|
geffzhang
|
b10c95219e
|
merge circuitbreakerpattern code
|
2017-02-07 19:47:11 +08: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 |
|
geffzhang
|
456c2b9c89
|
Merge branch 'develop' of https://github.com/geffzhang/Ocelot into develop
|
2017-02-07 11:22:41 +08:00 |
|
geffzhang
|
f04988f7ae
|
Merge remote-tracking branch 'refs/remotes/TomPallister/develop' into develop
|
2017-02-07 11:22:30 +08:00 |
|
geffzhang
|
338d1c0c3c
|
Merge pull request #5 from TomPallister/develop
merge servicediscovery
|
2017-02-07 07:26:37 +08:00 |
|
Tom Pallister
|
9e9303c25f
|
Merge pull request #28 from TomPallister/feature/servicediscovery
Feature/servicediscovery
|
2017-02-06 22:13:21 +00:00 |
|