902 Commits

Author SHA1 Message Date
Tom Gardham-Pallister
9c757e2bd8 Merge branch 'develop' of github.com:ThreeMammals/Ocelot into develop 2018-03-14 19:51:54 +00:00
Tom Gardham-Pallister
4e25f72a97 #271 Added some extra logging 2018-03-14 19:50:46 +00:00
Tom Pallister
d24df36420
#271 Added some extra logging (#276) 2018-03-14 18:49:41 +00:00
Tom Gardham-Pallister
43bac3602e Merge branch 'release-5.0.1' 2018-03-13 20:32:56 +00:00
Tom Pallister
fd2c5364fc
#270 exposed ReRoute priority (#272) 2018-03-13 20:31:22 +00:00
geffzhang
1a5687aca2
Merge pull request #42 from ThreeMammals/develop
merge newest code
2018-03-12 21:55:44 +08:00
TomPallister
16c70e8b65 #264 missed this docs change 2018-03-10 21:24:07 +00:00
TomPallister
b8c908558e Merge branch 'release-5.0.0' 2018-03-10 21:03:38 +00:00
Tom Pallister
4c840d40a6
Feature/re route specific handlers (#269)
* #264 added handlers to config

* #264 added global handlers object and defaut param for method, not sure this is correct api for users yet

* #264 Can now add all sorts of delegating handlers in all sorts of ways

* +semver: breaking #264
2018-03-10 21:02:59 +00:00
Tom Gardham-Pallister
ae5b86ef61 Merge branch 'release-4.0.0' 2018-03-09 07:38:50 +00:00
Tom Pallister
a31a3ae0fc
Delegating Handlers from container (#266)
* #259 quickly hacked poc for this together, needs tidying up maybe

* #266 +semver: breaking removed adding delegating handler funcs directly...i feel from container is enough
2018-03-09 07:37:37 +00:00
Philip Wood
28cc519341
Merge pull request #261 from binarymash/feature/ReduceBuildWarnings
Feature/reduce build warnings
2018-03-08 20:39:26 +00:00
Tom Pallister
5e9ee1f2ed
#263 map all content specific headers to downstream request content property, make sure we dont map them to request specific headers, added a gzip encoding acceptance test (#267) 2018-03-08 07:32:06 +00:00
Philip Wood
8d5c5341eb Turn some of the rules back on. 2018-03-06 11:54:56 +00:00
Philip Wood
ea95690253 Fix remaining CS0649 violations 2018-03-06 11:13:02 +00:00
Philip Wood
b8e95373a4 Fix async/await warnings 2018-03-06 10:59:01 +00:00
Tom Pallister
db05935b89
updated not supported with reasons why Ocelot doesnt support swagger (#258) 2018-03-05 20:18:58 +00:00
geffzhang
681f0551cd
Merge pull request #41 from ThreeMammals/develop
support_service_fabric
2018-03-05 08:36:58 +08:00
TomPallister
7e1f8a4604 Added service fabric to big picture in docs 2018-03-04 10:24:04 +00:00
TomPallister
254910fea3 Merge branch 'release-3.1.9' 2018-03-04 10:04:47 +00:00
TomPallister
b7e409214b #238 - updated readme 2018-03-04 10:02:53 +00:00
TomPallister
e1325568d2 Merge branch 'develop' into feature/#238-statefull 2018-03-03 17:12:41 +00:00
Philip Wood
a53338312b
Merge pull request #255 from binarymash/feature/AddStyleCopAnalyzers
Feature/add style cop analyzers
2018-03-03 17:10:44 +00:00
TomPallister
2f37acc792 #238 updated readme 2018-03-03 17:08:39 +00:00
TomPallister
4a28666a41 #238 support passing statefull service headers to service fabric naming service 2018-03-03 17:05:40 +00:00
Philip Wood
52166b4987 Merge remote-tracking branch 'upstream/release-3.1.8' into feature/AddStyleCopAnalyzers
# Conflicts:
#	src/Ocelot/Configuration/ServiceProviderConfiguration.cs
2018-03-03 16:28:19 +00:00
TomPallister
943530a1ad Merge branch 'release-3.1.8' 2018-03-03 15:25:32 +00:00
Tom Pallister
454ba3f9a0
Make Ocelot work with service fabric DNS and naming service for guest exe and stateless (#242)
* test for issue

* added service fabric sample

* working!!

* changed sample naming to Ocelot

* removed files we dont need

* removed files we dont need

* updated sample gitignore

* updated sample gitignore

* getting ocelot to work with service fabric using the reverse proxy

* #238 - added support for service fabric discovery provider, proxies requests through naming service, wont work on partioned service fabric services yet

* #238 - Manually tested service fabric using sample..all seems OK. Made some changes after testing, added docs

* #238 - added docs for servic fabric
2018-03-03 15:24:05 +00:00
Philip Wood
01fe4ef9aa Turn off a few more rules 2018-03-03 14:15:39 +00:00
Philip Wood
50980fda93 Fix various violations
SA1216, CS0105, CS0169, CS0414, CS0649
2018-03-03 14:08:52 +00:00
Philip Wood
a64e263a26 Fix file names to match class names
SA1649
2018-03-03 13:48:30 +00:00
Philip Wood
c7dbfc044f Fix else statement spacing
SA1510
2018-03-03 13:36:09 +00:00
Philip Wood
b18c8e5f2b Fix single-line comment spacing
SA1512, SA1515
2018-03-03 13:34:19 +00:00
Philip Wood
f24c0a0510 Fix multiple statements on single line
SA1107
2018-03-03 13:29:05 +00:00
Philip Wood
167fbb3daf Remove multiple concurrent blank lines
SA1507
2018-03-03 13:26:27 +00:00
Philip Wood
edbed051de Remove blank lines at start/end of files
SA1517, SA1518
2018-03-03 13:16:26 +00:00
Philip Wood
c61dc9fd11 Fix brace line spacing and remove multiple concurrent whitespace characters
SA1025, SA1505, SA1508, SA-1509, SA1513
2018-03-03 13:14:24 +00:00
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
Tom Pallister
9cb25ab063
Update README.md 2018-03-02 18:00:49 +00:00
Tom Pallister
b7db8773b6
Update README.md 2018-03-02 17:58:22 +00:00
Tom Pallister
2d3d2abf06
Update CONTRIBUTING.md 2018-03-02 17:48:21 +00:00
Tom Pallister
dfb0759c75
Rename ULL_REQUEST_TEMPLATE.md to PULL_REQUEST_TEMPLATE.md 2018-03-02 17:47:07 +00:00
Tom Pallister
ca291413c6
Update README.md 2018-03-02 17:45:58 +00:00
Tom Pallister
59bd482fc7
Create CONTRIBUTING.md 2018-03-02 17:11:22 +00:00
Tom Pallister
fefeca676e
Create CODE_OF_CONDUCT.md (#254) 2018-03-02 17:08:43 +00:00
Tom Pallister
5b317f4605
Create ULL_REQUEST_TEMPLATE.md 2018-03-02 17:06:59 +00:00
Tom Pallister
68bc37419d
Create ISSUE_TEMPLATE.md 2018-03-02 17:05:13 +00:00
TomPallister
f95911bdf1 added logo to project 2018-03-02 10:25:44 +00:00
geffzhang
c0ae4bc9ed
Merge pull request #40 from TomPallister/develop
merge downstream aggregation
2018-03-02 07:30:40 +08:00
TomPallister
1aa077560c Merge branch 'release-3.1.7' 2018-03-01 13:01:44 +00:00