Commit Graph

1084 Commits

Author SHA1 Message Date
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
buildmaster
2e40fcec41 Bumping versions to 2.2.2.BUILD-SNAPSHOT after release 2019-12-20 11:59:03 +00:00
buildmaster
980ce49895 Going back to snapshots 2019-12-20 11:59:03 +00:00
buildmaster
f533ef1553 Update SNAPSHOT to 2.2.1.RELEASE 2019-12-20 11:53:32 +00:00
Olga Maciaszek-Sharma
8c054083cc Use configuration properties instead of environment. (#662)
* Use configuration properties instead of environment.

* Fix after review.
2019-12-19 17:27:40 +01:00
buildmaster
f25bbad456 Bumping versions 2019-12-18 16:05:04 +00:00
Olga Maciaszek-Sharma
75338cde79 Zoned ServiceInstanceListSupplier (#658)
* Get ServiceInstance zone from metadata.

* Add ZonePreferenceServiceInstanceListSupplier.

* Add javadocs and license entries.

* Add tests.

* Add documentation.

* Documentation fix.

* Fix after code review.
2019-12-18 15:25:51 +01:00
Spencer Gibb
be0fa8f1b8 Merge branch '2.1.x' 2019-12-17 19:28:18 -05:00
Spencer Gibb
6c9bcb9f38 Adds static to ConfigurationPropertiesBeans bean.
This avoids a bean post processor warning.

Fixes gh-657
2019-12-17 19:26:49 -05:00
Spencer Gibb
5f3981bbfc Merge branch '2.1.x' 2019-12-17 17:18:01 -05:00
Spencer Gibb
618d2b31ba Adds .flattened-pom.xml 2019-12-17 17:16:43 -05:00
Spencer Gibb
d8db91206e Moves locateCollection impl to static method 2019-12-17 17:15:49 -05:00
Dave Syer
bfbadec0f0 Prevent listeners being added multiple times on restart
(and at other times potentially - e.g. if 2 contexts share a parent).

Plus some general tidy up on compiler warnings.

Fixes gh-613
2019-12-17 16:31:11 +00:00
Ryan Baxter
4cc23b4b71 Merge remote-tracking branch 'origin/2.1.x' 2019-12-13 19:38:27 -05:00
Ryan Baxter
d0ca983936 Removing the possibility of null propertysources being returned in the locator 2019-12-13 19:37:57 -05:00
Ryan Baxter
e4be432ec4 Merge remote-tracking branch 'origin/2.1.x' 2019-12-13 12:09:24 -05:00
Ryan Baxter
763b6c1711 Add each PropertySource from PropertySourceLocators individually (#652)
* Add each PropertySource from PropertySourceLocators individually instead of as a CompositePropertySource.  Fixes #611
2019-12-13 12:01:23 -05:00
Ryan Baxter
04c24271e7 Merge remote-tracking branch 'origin/2.1.x' 2019-12-11 16:24:04 -05:00
Ryan Baxter
b7bef1d3e0 Added clarification to documentation on where to set spring.profiles.active. Fixes #612 2019-12-11 16:23:35 -05:00
Olga Maciaszek-Sharma
de9e259b1e Make LoadBalancer cache conditional on no Ribbon default. (#650) 2019-12-11 15:55:41 +01:00
Tim Ysewyn
7b0af856a4 Bumped spring-security-rsa 2019-12-09 15:12:30 +01:00
Tim Ysewyn
af772dbafb Bumped spring-security-rsa 2019-12-09 14:57:26 +01:00
Jay Bryant
359dd79aac Making the Load Balancer and Circuit Breaker sections consistent (#646)
I edited the Load Balancer and Circuit Breaker sections to make them be consistent with the rest of the document. I tinkered with some other things while I was at it.
2019-12-02 20:16:14 -05:00
buildmaster
b2d834f37f Bumping versions 2019-11-26 16:04:59 +00:00