Commit Graph

346 Commits

Author SHA1 Message Date
Spencer Gibb
d76416f03c Merge branch 'master' into 2.0.x 2017-10-04 19:35:34 -04:00
Alex Sartan
7f97a61ed5 Fix minor grammar issue in Zuul doc (#2336) 2017-10-01 13:25:32 -04:00
Spencer Gibb
39b1c0fe0d Update routes endpoint to new endpoint infrastructure.
fixes gh-2318
2017-09-29 16:30:46 -04:00
Spencer Gibb
49fdcae8c2 Compile fixes for boot 2 2017-09-25 17:20:58 -04:00
Ryan Baxter
b9a479607c Merge remote-tracking branch 'origin/master' into 2.0.x 2017-09-25 14:18:49 -04:00
Andre Dörnbrack
05a3db3cc0 Fix zuul post retry (#2209)
Modfied RibbonCommandContext to make request entity resettable. fixes gh-892
2017-09-25 13:59:31 -04:00
Ryan Baxter
145b7ce69a Remove @EnableDiscoveryClient and @EnableEurekaClient (#2242)
* Remove @EnableDiscoveryClient and @EnableEurekaClient as there are now optional.  Fixes #2241.
2017-09-25 13:18:04 -04:00
Ryan Baxter
fa9a8bbf95 Merge remote-tracking branch 'origin/master' into 2.0.x 2017-09-08 14:15:26 -04:00
Ryan Baxter
24d0bedf7d Merge pull request #2255 from DominikMostek/fallback_cause
Fallback cause is propagated to fallback provider
2017-09-08 14:12:52 -04:00
Ryan Baxter
81c6ece801 Merge remote-tracking branch 'origin/master' into 2.0.x 2017-09-07 12:59:58 -04:00
Dominik Mostek
4dc5088fb2 Updated documentation with new FallbackProvider 2017-09-07 12:55:33 +02:00
Jin Zhang
885425e2a3 format 'pom.xml' code style (#2257) 2017-09-06 22:26:20 -04:00
Ryan Baxter
ace95a3355 Merge pull request #2240 from gzurowski/remove-lombok-from-docs
Remove Lombok from documentation
2017-08-31 16:47:25 -04:00
Marcin Grzejszczak
1e0e078c17 Merge branch 'master' into 2.0.x 2017-08-31 15:01:56 +02:00
Marcin Grzejszczak
ebe3800c75 Merge branch '1.3.x' 2017-08-31 15:01:12 +02:00
Marcin Grzejszczak
30b98bea85 Referrencing resources from sc-build 2017-08-31 15:01:05 +02:00
Gregor Zurowski
d9738a7ee5 Remove Lombok from documentation
Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
2017-08-31 12:15:35 +02:00
Marcin Grzejszczak
e7b91c0a85 Merge branch 'master' into 2.0.x 2017-08-29 16:02:26 +02:00
Marcin Grzejszczak
5e9fa908b4 Merge branch '1.3.x' 2017-08-29 15:59:39 +02:00
Marcin Grzejszczak
91808c5fd9 Updated whitelists 2017-08-29 15:57:17 +02:00
Marcin Grzejszczak
0784b1ee19 Migrated to new docs; fixes #2237 2017-08-29 15:54:31 +02:00
Marcin Grzejszczak
9d2964ee7d Merge branch 'master' into 2.0.x 2017-08-29 15:07:14 +02:00
Marcin Grzejszczak
4a8913f7ea Migrated to new docs; fixes #2237 2017-08-29 15:04:32 +02:00
Ryan Baxter
8fbd73af1e Going back to snapshots 2017-08-24 17:54:53 -04:00
Ryan Baxter
1be2b2c295 Update SNAPSHOT to 1.4.0.M1 2017-08-24 17:49:28 -04:00
Ryan Baxter
02778fd670 fixing links in docs 2017-08-24 17:07:42 -04:00
Ryan Baxter
947d30c5c4 Bumping versions to 1.3.5.BUILD-SNAPSHOT after release 2017-08-18 13:59:32 -04:00
Ryan Baxter
e71ce3395d Going back to snapshots 2017-08-18 13:59:31 -04:00
Ryan Baxter
f5e7be25dd Update SNAPSHOT to 1.3.4.RELEASE 2017-08-18 13:55:59 -04:00
Ryan Baxter
fcb1f5dc54 Bumping versions to 1.3.4.BUILD-SNAPSHOT after release 2017-08-18 07:55:23 -04:00
Ryan Baxter
9b7a2f93ad Going back to snapshots 2017-08-18 07:55:22 -04:00
Ryan Baxter
9ce253b644 Update SNAPSHOT to 1.3.3.RELEASE 2017-08-18 07:51:04 -04:00
Spencer Gibb
5a9d24044f Going back to snapshots 2017-08-17 16:02:06 -06:00
Spencer Gibb
b853da673c Update SNAPSHOT to 2.0.0.M2 2017-08-17 15:53:24 -06:00
Ryan Baxter
d56b5abde2 Merge remote-tracking branch 'origin/master' into 2.0.x 2017-08-17 14:48:24 -04:00
Ryan Baxter
24cbbb9a11 Merging 1.3.x into master 2017-08-17 14:47:45 -04:00
Ryan Baxter
07b99704ee Fixes #1523. Document untrusted certificates when connecting to hystrix.stream endpoint. 2017-08-17 14:02:14 -04:00
Ryan Baxter
488075de9b Merge remote-tracking branch 'origin/master' into 2.0.x 2017-08-03 13:18:07 -04:00
Ryan Baxter
bd7e75f4b3 Merge remote-tracking branch 'Upstream/master' into http-client-centralization 2017-08-01 16:46:07 -04:00
Spencer Gibb
6952d1ab48 Merge branch 'master' into 2.0.x 2017-07-21 14:23:55 -06:00
Daniel Lavoie
bbac5a730f Rename starters to include -netflix- (#1886)
Fixes gh-665
2017-07-21 15:59:32 -04:00
Daniel Lavoie
348c96bf13 Optionally remove Jersey dependencies from Eureka Client (#1850)
Fixes gh-1849
2017-07-21 15:55:57 -04:00
Biju Kunjummen
fd783734ac Add docs for default ribbon client configuration (#2142)
fixes #1741
2017-07-21 11:45:01 -04:00
Spencer Gibb
1d6b47ceef Bumping versions to 1.3.3.BUILD-SNAPSHOT after release 2017-07-20 11:39:09 -06:00
Spencer Gibb
cda1c876b2 Going back to snapshots 2017-07-20 11:39:08 -06:00
Spencer Gibb
6112ea2558 Update SNAPSHOT to 1.3.2.RELEASE 2017-07-20 11:30:44 -06:00
Spencer Gibb
3c409d3bc1 Merge branch 'master' into 2.0.x 2017-07-19 12:18:59 -06:00
Spencer Gibb
1cf509c365 Merge branch '1.3.x' 2017-07-19 12:12:01 -06:00
Jayanth
e525ab7d64 Hystrix open threshold documentation (#2136)
fixes gh-1943
2017-07-18 17:18:01 -04:00
Spencer Gibb
12c7ae1e05 Merge branch 'master' into 2.0.x 2017-07-18 12:42:59 -06:00