Commit Graph

2008 Commits

Author SHA1 Message Date
Ryan Baxter
cb0a693cc9 merge 2.1.x into 2.2.x 2020-01-28 20:19:31 -05:00
Ryan Baxter
f5baab301d Merge branch 'srempfer-466' into 2.1.x 2020-01-28 20:15:40 -05:00
Ryan Baxter
c982cd8798 Merge branch '466' of https://github.com/srempfer/spring-cloud-commons into srempfer-466 2020-01-28 20:15:16 -05:00
buildmaster
21e4eb8bf9 Bumping versions 2020-01-28 16:05:45 +00:00
Olga Maciaszek-Sharma
bf50a50a4d Merge branch '2.2.x' 2020-01-28 16:14:04 +01:00
Olga Maciaszek-Sharma
07977b4ad5 Make LoadBalancerClientFactory bean conditional on missing bean. (#679) 2020-01-28 16:12:52 +01:00
Spencer Gibb
8631642080 Merge branch '2.2.x' 2020-01-27 17:30:30 -05:00
Spencer Gibb
da3a253af3 Merge branch '2.1.x' into 2.2.x 2020-01-27 17:30:13 -05:00
Spencer Gibb
6ad13c2de8 Removes inadvertant copied file 2020-01-27 17:23:27 -05:00
Spencer Gibb
7680957370 Merge branch '2.2.x' 2020-01-27 17:06:49 -05:00
Spencer Gibb
c69bf5c597 Merge branch '2.1.x' into 2.2.x 2020-01-27 17:06:31 -05:00
Spencer Gibb
a6354ea405 formatting 2020-01-27 17:06:27 -05:00
Spencer Gibb
b10e449279 Forces web-application-type=none in ContextRefresher.
This allows apps with spring.main.web-application-type={REACTIVE|SERVLET} to function properly without error.

fixes gh-678
2020-01-27 17:06:04 -05:00
Spencer Gibb
2ddcd6c4ce fixes description 2020-01-27 17:01:12 -05:00
Spencer Gibb
774fa69001 fixes ordering 2020-01-27 17:00:59 -05:00
Spencer Gibb
ebc46d60ec Moves integration tests to separate package 2020-01-27 17:00:18 -05:00
Spencer Gibb
e8f9610f9f removes unused files 2020-01-27 16:59:38 -05:00
buildmaster
e08b8b61aa Bumping versions 2020-01-27 16:05:57 +00:00
Ryan Baxter
58b6fc2ce6 Merge remote-tracking branch 'origin/2.2.x' 2020-01-27 10:11:39 -05:00
Ryan Baxter
f043e0dd4e Making capacity getter and setter public. Fixes #676 2020-01-27 10:10:53 -05:00
Spencer Gibb
e4fcb5c771 formatting 2020-01-21 23:16:52 -05:00
Spencer Gibb
dfed4a1a62 Merge branch '2.2.x' 2020-01-21 23:15:42 -05:00
Spencer Gibb
97020405d9 Adds FixedServiceInstanceListSupplier 2020-01-21 23:15:29 -05:00
buildmaster
d0febfbfba Bumping versions 2020-01-21 18:07:45 +00:00
Spencer Gibb
8aaeeaf558 Merge branch '2.2.x' 2020-01-21 12:49:02 -05:00
Spencer Gibb
eac5cde53a Removes unused branches 2020-01-21 12:46:54 -05:00
Spencer Gibb
0ce1c3a741 Migrates to new OutputCaptureRule 2020-01-21 12:45:30 -05:00
Spencer Gibb
55e7ce5103 Migrates to new OutputCaptureRule 2020-01-21 12:45:30 -05:00
Spencer Gibb
8b53f2862a Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation.
Swaps with ConditionalOnAvailableEndpoint
2020-01-21 12:45:30 -05:00
Marcin Grzejszczak
b6ddff7d2e Added 2.2.x to the list of whitelisted branches 2020-01-21 15:43:31 +01:00
buildmaster
bde980808c Bumping versions 2020-01-21 13:36:29 +00:00
buildmaster
c2fc64a3e5 Bumping versions 2020-01-20 16:05:03 +00:00
buildmaster
39921b2d33 Bumping versions 2020-01-20 13:11:59 +00:00
buildmaster
83d6912076 Bumping versions 2020-01-18 16:04:59 +00:00
Spencer Gibb
62a1233154 Adds boot 2.3 compatiblity 2020-01-17 16:36:55 -05:00
Spencer Gibb
4d77af18be Merge branch '2.2.x' 2020-01-17 16:25:15 -05:00
Spencer Gibb
905af987d4 Migrates to new OutputCaptureRule 2020-01-17 16:25:02 -05:00
Spencer Gibb
6d93d8e708 removes deprecated class 2020-01-17 16:23:27 -05:00
Spencer Gibb
027346bc34 Adds spring-hateoas version temporarily. 2020-01-17 16:23:00 -05:00
Spencer Gibb
0549a11cd3 Merge branch '2.2.x' 2020-01-17 15:52:49 -05:00
Spencer Gibb
e37b383c04 Migrates to new OutputCaptureRule 2020-01-17 15:52:35 -05:00
Spencer Gibb
1e27c58e85 Removes deprecated method 2020-01-17 15:50:45 -05:00
Spencer Gibb
0c370bf5b4 Merge branch '2.2.x' 2020-01-17 15:45:56 -05:00
Spencer Gibb
95186267e6 Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation.
Swaps with ConditionalOnAvailableEndpoint
2020-01-17 15:45:03 -05:00
Spencer Gibb
188b98a659 Updates to 3.0.0.BUILD-SNAPSHOT 2020-01-17 14:53:03 -05:00
Olga Maciaszek-Sharma
ec784b757e Add hints to API via the Request interface. Fixes gh-647. (#669)
* Add hints to API via the Request interface. Fixes gh-647.

* Switch to generic context.
2020-01-17 14:26:33 -05:00
Spencer Gibb
232c7f71d2 Adjusts ordering when override system properties is false. (#670)
This fixes as reversed property source bug.

fixes gh-668
2020-01-15 19:30:45 -05:00
Toshiaki Maki
d7767a058a Add once method for Customizer of circuit breaker (#626)
* Add Customizer.once

* Make the logic of Customer.once atomic

* Add document on how to use once method
2020-01-15 10:19:03 -05:00
Ryan Baxter
61ba39ee11 Fix broken links. Fixes #663 2020-01-06 12:46:57 -05:00
buildmaster
080cd374fc Bumping versions 2019-12-20 16:05:11 +00:00