Dave Syer
7a82540f59
Merge branch 'master' into 2.0.x
2017-09-22 14:22:07 +01:00
Dave Syer
e362f39285
Add simple implementation of JDBC environment repository
2017-09-22 13:39:29 +01:00
Spencer Gibb
9b8fa89549
Merge branch 'master' into 2.0.x
2017-09-11 15:24:55 -06:00
Edgars Jasmans
18a5da61d4
Added additional options for GIT SSH configuration property configuration ( #775 )
...
Abilty to specify known_hosts file
Added option to specify SSH 'PreferredAuthentications' property to override SSH server priorities for authentication methods.
fixes gh-101
2017-08-31 19:05:34 -04:00
Marcin Grzejszczak
d406ab6586
Merge branch 'master' into 2.0.x
2017-08-31 14:59:04 +02:00
Marcin Grzejszczak
921a4bcd17
Merge branch '1.3.x'
2017-08-31 14:58:20 +02:00
Marcin Grzejszczak
98512f3671
Referrencing resources from sc-build
2017-08-31 14:58:12 +02:00
Marcin Grzejszczak
ab9f16fe48
Migrated to new docs; fixes #782
2017-08-29 15:46:51 +02:00
Marcin Grzejszczak
5e62bdb2ef
Updated whitelisted branches
2017-08-29 13:37:23 +02:00
Marcin Grzejszczak
d9a79169a4
Merge branch 'master' into 2.0.x
2017-08-29 13:35:51 +02:00
Marcin Grzejszczak
9d43019a6e
Migrated to new docs; fixes #782
2017-08-29 13:28:48 +02: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
Ryan Baxter
310ed6c5bb
Fixing/updating versions in POMS
2017-08-18 16:30:33 -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
Ryan Baxter
617c761f17
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-07-31 10:14:22 -04:00
zhanhonglai
adb02b97bc
[Honglai] fix readme typo ( #748 )
2017-07-24 19:19:23 -04: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
Dave Syer
69b3754ae1
Merge branch 'master' into 2.0.x
2017-07-20 13:31:10 +01:00
Ollie Hughes
67cdfab7fa
Use JGit URIish to parse SSH URIs
...
Use JSR-303 cross field validation for `SshUriProperties`
Rebase with 1.3.x Dalston
2017-07-20 12:07:02 +01:00
Ollie Hughes
acee8a1b10
Git SSH configuration using properties
...
By default, Spring Cloud Config Server uses SSH configuration files such
as ~/.ssh/known_hosts and /etc/ssh/ssh_config when connecting to Git repositories
using an SSH URI. In cloud environments such as Cloud Foundry,
the local filesystem may be ephemeral or not easily accessible.
For cases such as these, SSH configuration can be set using Java properties.
In order to activate property based SSH configuration,
the property spring.cloud.config.server.git.ignoreLocalSshSettings must be set to true
2017-07-20 12:06:39 +01: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
223fdec032
Merge branch 'master' into 2.0.x
2017-06-28 13:26:50 +01:00
repos-jmp
d56926eba6
Encryption file output tip.
...
The encrypted output is right adjacent to the current speed value and causes confusion, added a tip for newcomers.
2017-06-28 13:24:39 +01:00
Ryan Baxter
1eaea85ec9
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-06-27 10:36:27 -04: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
Jayraj Jog
6d1e9aaeae
Git repo patterns need single-quotes
...
See https://github.com/spring-cloud/spring-cloud-config/issues/727
2017-06-26 14:21:22 -07: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
Venil Noronha
d9113a417d
Adds addLabelLocations option to ConfigServerProperties ( #681 )
...
Adds addLabelLocations option to server properties.
Also eliminates any duplicate locations.
Fixes gh-676
2017-05-19 18:13:02 -04:00
Dave Syer
4d4cd17ed2
Merge branch '1.2.x'
2017-05-08 20:29:11 +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
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
Johnny Lim
065bbefddc
Fix typos in the reference doc ( #672 )
2017-03-22 11:16:20 -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
Ryan Baxter
e5e575370e
Bumping versions for next release
2017-03-08 10:56:04 -05:00
Ryan Baxter
b705ed8709
Revert "Version changes for 1.2.3.RELEASE"
...
This reverts commit cd09c75ef0
2017-03-07 20:06:48 -05:00
Ryan Baxter
cd09c75ef0
Version changes for 1.2.3.RELEASE
2017-03-07 19:59:10 -05:00
Ryan Baxter
a51412e629
Escaping underscore
2017-02-24 11:45:09 -05:00
