Spencer Gibb
fee1e87c5a
Update tests for spring boot 2.0 compatibility
2017-09-26 16:31:00 -04:00
Spencer Gibb
cc68857051
Move back to java8
2017-09-11 16:05:23 -06:00
Spencer Gibb
0e46f86082
Merge branch 'master' into 2.0.x
2017-09-11 16:02:10 -06:00
Spencer Gibb
6b09a15856
Merge branch '1.3.x'
2017-09-11 15:55:40 -06:00
Spencer Gibb
426ccd3a65
compile with java7
2017-09-11 15:53:20 -06:00
Ryan Baxter
2f1c65dbca
Going back to snapshots
2017-08-24 16:27:49 -04:00
Ryan Baxter
170af24f89
Update SNAPSHOT to 1.4.0.M1
2017-08-24 16:26:38 -04:00
Spencer Gibb
1d57a06001
Going back to snapshots
2017-08-17 15:42:24 -06:00
Spencer Gibb
37a5f8b3df
Update SNAPSHOT to 2.0.0.M2
2017-08-17 15:40:23 -06:00
Spencer Gibb
ebbe75d6aa
Bumping versions to 1.3.3.BUILD-SNAPSHOT after release
2017-07-20 11:03:30 -06:00
Spencer Gibb
00e08f99b3
Going back to snapshots
2017-07-20 11:03:30 -06:00
Spencer Gibb
d52715c061
Update SNAPSHOT to 1.3.2.RELEASE
2017-07-20 10:52:01 -06:00
Spencer Gibb
991e95037a
Going back to snapshots
2017-06-28 10:03:56 -06:00
Spencer Gibb
deb1d6ad70
Update SNAPSHOT to 2.0.0.M1
2017-06-28 10:01:43 -06:00
Dave Syer
95a5c950c7
Merge branch 'master' into 2.0.x
...
There are still issues with the encryptor in bootstrap mode.
2017-06-27 12:05:59 +01:00
Ryan Baxter
7f7b1040e0
Bumping version to 1.4.0
2017-06-14 16:35:47 -04:00
Ryan Baxter
a33487312a
Merge pull request #702 from Mastercard/master
...
auto configuration to allow for overriding the `ConfigServiePropertySourceLocator` bean
2017-06-01 09:22:33 -04:00
Spencer Gibb
8ca749ff4b
Bumping versions to 1.3.2.BUILD-SNAPSHOT after release
2017-05-24 10:23:14 -06:00
Spencer Gibb
446a65f4e1
Going back to snapshots
2017-05-24 10:23:14 -06:00
Spencer Gibb
63e6a0ebd3
Update SNAPSHOT to 1.3.1.RELEASE
2017-05-24 10:23:14 -06:00
Hanson, Tristan
566cb39428
Updating auto configuration to allow for overriding the ConfigServicePropertySourceLocator bean
...
Allow override of `ConfigServicePropertySourceLocator` bean to support the setting of a custom `RestTemplate` instance without the need to set `spring.cloud.config.enabled=false`
Fixes gh-699
Fixes gh-613
2017-05-23 14:41:34 -05:00
Dave Syer
d4bc8503a5
Fix all tests with Spring Boot latest snapshots
2017-05-12 17:45:42 +01:00
Dave Syer
1f9d6a5b3f
Fix for new changes in Boot (mainly package changes in autoconfig)
2017-05-11 16:09:24 +01:00
Spencer Gibb
06393add99
Merge branch 'master' into 2.0.x
...
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-config-client/pom.xml
# spring-cloud-config-dependencies/pom.xml
# spring-cloud-config-monitor/pom.xml
# spring-cloud-config-sample/pom.xml
# spring-cloud-config-server/pom.xml
# spring-cloud-starter-config/pom.xml
2017-04-28 15:58:33 -06:00
Johnny Lim
295402481d
Remove unreachable assertNull()
2017-04-14 13:50:57 +09:00
Ryan Baxter
dfa609aa0d
Bumping version for next release
2017-04-07 05:29:57 -04:00
Ryan Baxter
7bada56f30
Going back to snapshots
2017-04-07 05:01:59 -04:00
Ryan Baxter
e051d56965
Update SNAPSHOT to 1.3.0.RELEASE
2017-04-07 04:55:32 -04:00
Mathieu Ouellet
45336cd11f
Add headers configuration property
...
This commit provides an alternative implementation for creating
config client request using the headers config prop instead
of having to create custom 'RestTemplate' when adding header to
the request.
See discusions at gh-650
Not covering gh-613
2017-04-05 18:30:25 -06:00
Nastya Smirnova
3abc1ab84c
Makes fetching of config server from Eureka retryable
...
Makes fetching of config server from Eureka retryable, adds support for failfast
Retry requires spring-retry to be on the classpath.
2017-03-24 16:14:51 -04:00
Spencer Gibb
2bc2abcfae
fix compile error for boot 2.0
2017-03-17 20:14:04 -06:00
Ryan Baxter
94bd2a98b8
Revert "Version changes for Dalston.RC1"
...
This reverts commit 78c24a18b2
2017-03-16 11:42:14 -04:00
Ryan Baxter
78c24a18b2
Version changes for Dalston.RC1
2017-03-16 11:19:21 -04:00
Spencer Gibb
9094984b76
Ensure explicit password takes precedence.
...
fixes gh-622
2017-02-01 15:15:11 -07:00
Spencer Gibb
2521778f94
Revert "Update SNAPSHOT to 1.3.0.M2"
...
This reverts commit fbaf5a22d1
2017-01-27 08:36:59 -07:00
Spencer Gibb
fbaf5a22d1
Update SNAPSHOT to 1.3.0.M2
2017-01-27 08:35:29 -07:00
Ryan Baxter
edcb0cd5b8
Revert "Version changes for 1.3.0.M1 release"
...
This reverts commit 2378521e22
2017-01-26 20:23:57 -05:00
Ryan Baxter
2378521e22
Version changes for 1.3.0.M1 release
2017-01-26 20:21:21 -05:00
Ryan Baxter
5ebecb60b4
Removed OrderedEnvironmentRepository interface, and applied other review feedback.
2016-12-20 13:46:46 -05:00
Ryan Baxter
214a5a03c4
Merge remote-tracking branch 'Upstream/master' into composite-envrepo-555
2016-12-19 12:39:45 -05:00
Ryan Baxter
133c172ddd
Allows users to provide composite environments. Fixes #495 .
2016-12-19 12:28:41 -05:00
Spencer Gibb
171d2b261b
Update to s-c-build 1.3.0 and bump version to 1.3.0
2016-12-12 09:26:34 -07:00
Ryan Baxter
d2961eceae
Bumped versions for next release
2016-11-23 12:59:00 -05:00
Ryan Baxter
bd3d2c94f3
Revert "Version changes for 1.2.2 RELEASE"
...
This reverts commit 66c092949b
2016-11-23 12:51:47 -05:00
Ryan Baxter
66c092949b
Version changes for 1.2.2 RELEASE
2016-11-23 12:18:12 -05:00
Ryan Baxter
6766323c40
Version changes for next release
2016-10-18 09:17:06 -04:00
Ryan Baxter
7105329eb6
Revert "Versions changes for 1.2.1 RELEASE"
...
This reverts commit 6e8434cf10
2016-10-18 09:11:40 -04:00
Ryan Baxter
6e8434cf10
Versions changes for 1.2.1 RELEASE
2016-10-18 07:56:02 -04:00
Spencer Gibb
b155a1d58b
Cache config client health indicator.
...
So config server isn't bombarded with requests.
2016-10-13 09:10:32 -06:00
Ryan Baxter
8e99e1a25f
Bumped version numbers for next release
2016-09-22 14:39:04 -04:00
