 geffzhang
|
4bd14f7537
|
Merge branch 'develop' of https://github.com/geffzhang/Ocelot into develop
|
2017-02-26 14:06:28 +08:00 |
|
 geffzhangandGitHub
|
26c7d1e37b
|
Merge pull request #13 from TomPallister/develop
Update Ocelot configuration without downtime
|
2017-02-26 10:56:36 +08:00 |
|
|
geffzhangandGitHub
|
a32f23ef05
|
Merge pull request #12 from TomPallister/develop
merge newest code
|
2017-02-24 07:16:46 +08:00 |
|
|
geffzhangandGitHub
|
ad01818596
|
Merge pull request #11 from TomPallister/develop
merge newest code
|
2017-02-18 08:27:54 +08:00 |
|
|
geffzhangandGitHub
|
2fcf944d55
|
Merge pull request #10 from TomPallister/develop
merge rate limit
|
2017-02-15 18:28:04 +08:00 |
|
|
geffzhang
|
f302ee77bf
|
remove bak file
|
2017-02-15 08:54:20 +08:00 |
|
|
geffzhang
|
ab6ae8a062
|
merge newest code for develop
|
2017-02-15 08:50:22 +08: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 |
|
|
geffzhangandGitHub
|
c966227ea9
|
Merge pull request #9 from TomPallister/develop
Merge Newest code
|
2017-02-15 07:13:21 +08: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 |
|
|
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 |
|
|
geffzhang
|
08c9700a4a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
|
2017-02-10 23:19:17 +08:00 |
|
|
geffzhangandGitHub
|
9267918270
|
Merge pull request #7 from TomPallister/master
Master
|
2017-02-10 07:09:14 +08:00 |
|
|
geffzhangandGitHub
|
bc5f284afa
|
Merge pull request #6 from TomPallister/develop
Merge CircuitBreakerPattern
|
2017-02-10 07:05:24 +08: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 |
|
|
geffzhangandGitHub
|
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 |
|
|
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 |
|
|
geffzhangandGitHub
|
a895fdfc12
|
Merge branch 'develop' into CircuitBreakerPattern
|
2017-02-07 18:41:11 +08: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 |
|
|
geffzhangandGitHub
|
338d1c0c3c
|
Merge pull request #5 from TomPallister/develop
merge servicediscovery
|
2017-02-07 07:26:37 +08:00 |
|
|
geffzhangandGitHub
|
2e0bd6d556
|
Merge pull request #2 from TomPallister/develop
merge current code
|
2017-02-03 14:58:57 +08:00 |
|
|
geffzhang
|
883be802b3
|
Refactor CircuitBreaker Pattern
Add Qos Config in ReRoute And Refactor CircuitBreakingDelegatingHandler
|
2017-02-03 14:49:46 +08:00 |
|
|
geffzhang
|
e80364a1f8
|
HttpClientHttpRequester implements the Circuit Breaker Pattern
HttpClientHttpRequester implements the Circuit Breaker Pattern，I using
Polly from thepollyproject.org
|
2017-02-02 23:35:02 +08:00 |
|
|
geffzhang
|
2ba91aeb5e
|
Merge remote-tracking branch 'refs/remotes/TomPallister/develop' into develop
|
2017-02-02 23:00:16 +08:00 |
|
|
geffzhangandGitHub
|
86414c6917
|
Merge pull request #1 from TomPallister/develop
mergecode
|
2016-12-18 13:14:20 +08:00 |
|