tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2026-05-06 03:09:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
509 Commits 1 Branch 0 Tags
c1cfaf0fbb4d87b8047f0b21d5cd52bdbb4ef2a7
Commit Graph

509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Wood 3c9ad87b73 Fix cake on Mac. Also added compile-time support for OSX.10.12-x64. The acceptance tests still fail on this version of OS X, however, because of the funky stuff going on in TestConfiguration.cs. Fixing this is outside the scope of this issue. 2017-02-19 15:03:11 +00:00
TomPallister d236ed3018 trying to get identity server authing 2017-02-19 13:59:17 +00:00
TomPallister fa47663259 changed file config stuff to just use app base directory 2017-02-19 12:58:22 +00:00
Tom Gardham-Pallister 816221c7a6 morehaking about 2017-02-19 12:33:09 +00:00
geffzhang ad01818596 Merge pull request #11 from TomPallister/develop 
merge newest code
 2017-02-18 08:27:54 +08:00
Tom Pallister 9d8d99ef4e Merge pull request #47 from TomPallister/feature/nuget-package-details 
updated nuget info
 2017-02-17 20:22:40 +00:00
Tom Gardham-Pallister ed3a629827 updated nuget info 2017-02-17 20:17:23 +00:00
Tom Gardham-Pallister b98310c80d working ssl example 2017-02-17 18:24:32 +00:00
Tom Gardham-Pallister 4dac8cb4fb still hacking around 2017-02-17 07:27:49 +00:00
Tom Pallister 6b94c83451 Merge pull request #45 from binarymash/develop 
Add syntax highlighting to readme
 2017-02-16 13:51:31 +00:00
Philip Wood 4ad8accbc0 grr! I always miss something... 2017-02-15 20:30:35 +00:00
Philip Wood 45341df237 Remove extra level of indentation. Fixed a typo in one of tje json examples 2017-02-15 20:18:15 +00:00
Philip Wood 0b4aee7b96 Add syntax highlighting to readme.md 2017-02-15 20:12:47 +00:00
Tom Gardham-Pallister bc5010837e removed using 2017-02-15 13:24:06 +00:00
geffzhang 2fcf944d55 Merge pull request #10 from TomPallister/develop 
merge rate limit
 2017-02-15 18:28:04 +08:00
Tom Gardham-Pallister 219b45e7d0 updated acceptance test assertion 2017-02-15 07:51:19 +00:00
Tom Gardham-Pallister 8ae8e2d834 added acceptance test for calling reroutes controller 2017-02-15 07:48:49 +00:00
Tom Gardham-Pallister 1e88062ce2 moved create admin area call 2017-02-15 07:43:50 +00:00
Tom Pallister 9203e7f465 Merge pull request #37 from geffzhang/RateLimit 
Rate limit
 2017-02-15 07:08:37 +00: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
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