Commit Graph

412 Commits

Author SHA1 Message Date
buildmaster
76e640012e Update SNAPSHOT to 2.0.0.M8 2018-03-02 17:16:30 +00:00
liolay
4ba22e5409 wrong value eval at ignoreLocalSshSettings (#892)
when "spring.cloud.config.server.git.ignoreLocalSshSettings" is "true",there is a wrong value eval at ignoreLocalSshSettings to decide whether SshUri configured in "spring.cloud.config.server.git.repos" need be validate
2018-02-28 20:14:18 -05:00
buildmaster
3b04c1f3dc Going back to snapshots 2018-02-26 21:03:33 +00:00
buildmaster
0c57097c08 Update SNAPSHOT to 2.0.0.M7 2018-02-26 21:02:45 +00:00
Dave Syer
33e85bdf58 Add encrypt.salt optional configuration 2018-02-22 11:08:56 +00:00
buildmaster
eb29a6d9ce Going back to snapshots 2018-02-09 21:41:41 +00:00
buildmaster
508bc2e151 Update SNAPSHOT to 2.0.0.M6 2018-02-09 21:40:55 +00:00
moon
ff453c4767 add tracking check to isClean() for git repo (#875) 2018-02-07 15:12:32 -05:00
Spencer Gibb
e558de8665 Merge branch '1.4.x' 2018-02-01 19:22:06 -05:00
Spencer Gibb
049fbf81c1 Env Controller support for {application} (_)
fixes gh-894
2018-02-01 17:19:52 -05:00
Johnny Lim
29ed2eb6c6 Remove a redundant assertion 2018-01-24 16:00:12 +09:00
buildmaster
7d20464efc Bumping versions to 1.4.2.BUILD-SNAPSHOT after release 2018-01-12 00:57:11 +00:00
buildmaster
2809b088f2 Going back to snapshots 2018-01-12 00:57:10 +00:00
buildmaster
8c3fb529a1 Update SNAPSHOT to 1.4.1.RELEASE 2018-01-12 00:55:46 +00:00
Dave Syer
d7af06ab12 Ensure config server doesn't try to start a web server
Even if the user (in a mad crazy fugue state) adds
spring.main.web-application-type explicitly to application.properties
we should ignore it when building the "mini" application that
creates the environment to export to remote clients.
2018-01-10 11:20:54 +00:00
Ryan Baxter
5e8b83aacb Merge remote-tracking branch 'origin/1.4.x' 2018-01-02 09:18:37 -05:00
Ryan Baxter
914fa948c8 Merge remote-tracking branch 'origin/1.3.x' into 1.4.x 2018-01-02 09:17:53 -05:00
Ryan Baxter
6b67fcf925 Adding @Validated annotation. Fixes #871. 2018-01-02 09:14:55 -05:00
Spencer Gibb
4f54e73545 Updates for changes in encryption defaults 2018-01-01 16:45:48 -05:00
Ryan Baxter
44701608ca Bumping versions to 1.3.5.BUILD-SNAPSHOT after release 2017-12-21 16:02:48 -05:00
Ryan Baxter
d704f08cda Going back to snapshots 2017-12-21 16:02:47 -05:00
Ryan Baxter
02603f030c Update SNAPSHOT to 1.3.4.RELEASE 2017-12-21 16:01:01 -05:00
buildmaster
c3a44ee390 Going back to snapshots 2017-12-02 02:24:22 +00:00
buildmaster
7ef9d7d99c Update SNAPSHOT to 2.0.0.M5 2017-12-02 02:23:36 +00:00
Spencer Gibb
b43cee2fa5 Merge branch '1.4.x' 2017-11-29 12:21:46 -05:00
Spencer Gibb
cf1bdf647d Fix test that breaks when run as a suite. 2017-11-29 12:21:02 -05:00
Spencer Gibb
98e02dcf1f Update test for ModifiedClassPathRunner 2017-11-28 16:48:08 -05:00
Spencer Gibb
56180bf229 Merge branch '1.4.x' 2017-11-28 16:45:45 -05:00
Spencer Gibb
b1f54c9590 Exclude DataSourceAutoConfiguration from sample application
fixes gh-819
2017-11-28 16:44:04 -05:00
Ryan Baxter
fbc65d34f6 Bumping versions to 1.4.1.BUILD-SNAPSHOT after release 2017-11-20 15:23:59 -05:00
Ryan Baxter
b976857cc2 Going back to snapshots 2017-11-20 15:23:58 -05:00
Ryan Baxter
db63853853 Update SNAPSHOT to 1.4.0.RELEASE 2017-11-20 15:22:35 -05:00
buildmaster
58ed6cb2fa Going back to snapshots 2017-11-15 01:12:28 +00:00
buildmaster
3993cd6a1e Update SNAPSHOT to 2.0.0.M4 2017-11-15 01:11:43 +00:00
Dave Syer
5ee81a0941 Merge branch 'master' into 2.0.x 2017-11-09 15:15:21 +00:00
Dave Syer
b278e531c9 Make SQL statement for JDBC repo configurable 2017-11-09 15:15:05 +00:00
Tommy Ludwig
b5022e3660 Make CompositeConfiguration conditional on missing bean
Previously, `CompositeConfiguration` (which is imported by `ConfigServerAutoConfiguration`) would unconditionally create a `CompositeEnvironmentRepository` bean marked as `@Primary`. This makes it difficult for users, in their code, to provide their own `CompositeEnvironmentRepository` bean to be used in various places. This adds a `ConditionalOnMissingBean` condition to the `Configuration` to make it easy to provide a primary `CompositeEnvironmentRepository` in user code.
2017-11-07 07:44:01 -05:00
Tommy Ludwig
3157bd4e2c Make CompositeConfiguration conditional on missing bean
Previously, `CompositeConfiguration` (which is imported by `ConfigServerAutoConfiguration`) would unconditionally create a `CompositeEnvironmentRepository` bean marked as `@Primary`. This makes it difficult for users, in their code, to provide their own `CompositeEnvironmentRepository` bean to be used in various places. This adds a `ConditionalOnMissingBean` condition to the `Configuration` to make it easy to provide a primary `CompositeEnvironmentRepository` in user code.
2017-11-06 21:04:24 +09:00
buildmaster
167d7e69d1 Going back to snapshots 2017-10-27 16:15:51 +00:00
buildmaster
52e883ff79 Update SNAPSHOT to 2.0.0.M3 2017-10-27 16:15:08 +00:00
Spencer Gibb
2238ad94c3 Merge branch 'master' into 2.0.x 2017-10-23 21:10:28 -04:00
Daniel Lavoie
1df2c15c88 Add support for default label on native environment repository (#826) 2017-10-23 15:10:36 -04:00
Spencer Gibb
67f7b693f8 Merge branch 'master' into 2.0.x 2017-10-20 17:22:15 -04:00
Spencer Gibb
e8db636509 Going back to snapshots 2017-10-20 17:16:12 -04:00
Spencer Gibb
a9bb8d4ec5 Update SNAPSHOT to 1.4.0.RC1 2017-10-20 17:15:30 -04:00
Spencer Gibb
d087d7e082 Merge branch '1.3.x' 2017-10-20 17:08:56 -04:00
Spencer Gibb
4c505e7b26 Merge branch 'master' into resource-default-label 2017-10-20 16:24:30 -04:00
Sean Dukehart
b333bd4ff9 Feature/organization project level enablement (#814)
* Changes to provide partial functionality for Issue #779

* Corrected formatting

* Additional tests to ensure backwards compatibility

* Corrected test

* Further testing to try to address code coverage concerns

* Additional tests to hopefully aid in code coverage diff

* Expect exceptions for null name (handle branch coverage)
2017-10-20 16:22:26 -04:00
Tommy Ludwig
4f6dcd0de8 Include TransportConfiguration for server bootstrap case (#812)
Previously, taking SSH configuration from properties (as opposed to the default SSH configuration files) was only possible when not bootstrapping the Config Server itself. This includes the `TransportationConfiguration` for the bootstrap case as well.

Related to gh-741
2017-10-20 16:20:15 -04:00
Mihaly Nyeste
ac76f6e970 Fix encryption of string containing curly braces (#774)
* Add test to reproduce curly brace problem

* Fix stripping prefix if string contains curly brace
2017-10-20 16:19:18 -04:00