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
Ryan Baxter
03588744ad
Merge pull request #840 from shakuzen/guard-composite
...
Make CompositeConfiguration conditional on missing bean
2017-11-06 20:20:01 -05:00
Ryan Baxter
f4c2c66fae
Merge pull request #831 from tomcruise81/documentation/issue_827
...
Documented (_) support for the {application} parameter
2017-11-06 15:00:36 -05:00
Ryan Baxter
ba8d7d468b
Merge pull request #837 from Dr4K4n/master
...
encrypt.* config needs to be in bootstrap.yml
2017-11-06 14:16:02 -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
Stefan Erichsen
349f365dbd
encrypt.* config needs to be in bootstrap.yml
...
For some reason starting with Dalston.SR2, the encrypt.* properties can no longer be defined in application.properties but need to be set in bootstrap.properties. The documentation now reflects this.
2017-11-02 12:52:39 +01:00
tomcruise81
eec2262db1
Documented (_) support for the {application} parameter
2017-10-27 12:34:18 -04: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
614e838ee7
Document useDefaultLabel for serving files without label.
2017-10-20 16:44:45 -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
Daniel Lavoie
01981aad53
ResourceController support for server defined default label.
...
Fixes #824
2017-10-19 12:42:51 -04:00
Spencer Gibb
a7bd68cf93
point to build snapshot.
2017-10-19 12:03:39 -04:00
Ryan Baxter
8b2bf46f92
Bumping versions to 1.3.4.BUILD-SNAPSHOT after release
2017-10-02 14:39:40 -04:00
Ryan Baxter
fbeea130eb
Going back to snapshots
2017-10-02 14:39:40 -04:00
Ryan Baxter
47cb05c7aa
Update SNAPSHOT to 1.3.3.RELEASE
2017-10-02 14:37:27 -04:00
Spencer Gibb
e42bcda48d
Update tests for spring boot 2.0 compatibility
2017-09-27 14:04:22 -04:00
Spencer Gibb
fee1e87c5a
Update tests for spring boot 2.0 compatibility
2017-09-26 16:31:00 -04:00
Dave Syer
7a82540f59
Merge branch 'master' into 2.0.x
2017-09-22 14:22:07 +01:00
Dave Syer
46253b746b
Fix some compiler warnings
2017-09-22 13:39:41 +01:00
Dave Syer
e362f39285
Add simple implementation of JDBC environment repository
2017-09-22 13:39:29 +01:00
Dave Syer
d2164400d7
Merge branch 'master' into 2.0.x
2017-09-21 14:02:27 +01:00
Dave Syer
6520992b31
Manage dependency for aws sdk
2017-09-21 14:00:10 +01:00
Dave Syer
5d80742e9c
Merge branch 'master' into 2.0.x
2017-09-21 13:54:55 +01:00
Dave Syer
70aea7c358
Fix ordering issues in environment repository config
2017-09-21 13:54:35 +01: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
90564e0572
Add missing import
2017-09-11 16:01:56 -06:00
Spencer Gibb
6b09a15856
Merge branch '1.3.x'
2017-09-11 15:55:40 -06:00
Spencer Gibb
6d89ed8059
Update jsch for newer keys
...
fixes gh-780
2017-09-11 15:53:51 -06:00
Spencer Gibb
426ccd3a65
compile with java7
2017-09-11 15:53:20 -06:00
Spencer Gibb
ec51b0a9a9
Update jgit to 4.8.0.201706111038-r
2017-09-11 15:35:04 -06:00
Spencer Gibb
9b8fa89549
Merge branch 'master' into 2.0.x
2017-09-11 15:24:55 -06:00
Spencer Gibb
3e6fc09bba
Merge branch '1.3.x'
2017-09-11 15:17:03 -06:00
Spencer Gibb
f995217841
unignore test
2017-09-11 15:15:12 -06:00
Spencer Gibb
b555ddfe92
Move back to java7 compatible jgit.
...
Fixes gh-780
2017-09-11 15:14:47 -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
Ryan Baxter
c97206e55c
Merge pull request #783 from izeye/patch-1
...
Fix error messages
2017-08-31 17:04:58 -04:00
Marcin Grzejszczak
d406ab6586
Merge branch 'master' into 2.0.x
2017-08-31 14:59:04 +02:00
