Ryan Baxter
8e99e1a25f
Bumped version numbers for next release
2016-09-22 14:39:04 -04:00
Ryan Baxter
573e99e53c
Revert "1.2.0.RELEASE version changes"
...
This reverts commit 14eba6d749 .
2016-09-22 14:31:30 -04:00
Ryan Baxter
14eba6d749
1.2.0.RELEASE version changes
2016-09-22 10:42:29 -04:00
Dave Syer
de79331014
Ensure version is scraped from parent pom
2016-09-20 13:48:13 +01:00
Dave Syer
53e049a812
Ensure EnvironmentController does not leak system properties
...
In the JSON and YAML endpoints system properties and env vars could
leak if the config contains placeholders with default values.
This change explicitly switches off that replacement (making the
JSON and JAML consistent with the properties endpoint).
Fixes gh-480, closes gh-492
2016-09-20 10:55:15 +01:00
Marcin Grzejszczak
4d458ee593
Updating mvnw for all projects
2016-09-19 19:30:33 +02:00
Dave Syer
0da283482c
Use placeholder for config version in dependency management
2016-09-19 13:47:37 +01:00
Marcin Grzejszczak
c800bd437c
Updating mvnw for all projects
2016-09-19 14:17:28 +02:00
Dave Syer
9237179826
Move unnecessary dependencies up a level
2016-09-19 12:02:14 +01:00
Marcin Grzejszczak
4a63f037b3
Updating mvnw for all projects
2016-09-19 12:45:44 +02:00
Marcin Grzejszczak
62195b4e5d
Updating mvnw for all projects
2016-09-15 16:11:19 +02:00
Ryan Baxter
9ba4666c4b
Added badges
2016-09-07 20:13:47 -04:00
Ryan Baxter
b23e2ec58c
adding sonar integration for code coverage
2016-09-07 16:02:10 -04:00
Ryan Baxter
1a232a0259
updating circle config
2016-09-07 15:33:36 -04:00
Ryan Baxter
9f61b0e364
adding circle config
2016-09-07 14:57:49 -04:00
Marcin Grzejszczak
ae41d6074d
Removed adoc footer
2016-09-07 18:00:37 +02:00
Marcin Grzejszczak
fb0e7f9dae
Updating mvnw for all projects
2016-09-07 17:27:36 +02:00
Ryan Baxter
1604a93cff
Revert "Camden.RC1 version changes"
...
This reverts commit 0e8d69083a .
2016-09-06 13:57:17 -04:00
Ryan Baxter
2eecb25489
Merge branch 'master' of https://github.com/spring-cloud/spring-cloud-config
2016-09-06 13:50:28 -04:00
Ryan Baxter
0e8d69083a
Camden.RC1 version changes
2016-09-06 13:50:20 -04:00
Spencer Gibb
b7afa2bb64
Merge pull request #483 from daniellavoie/git-force-push
...
* daniellavoie-git-force-push:
Handle git backend repository updated with force push
2016-09-06 09:19:03 -06:00
Daniel Lavoie
a68882937b
Handle git backend repository updated with force push
...
Fixes gh-481
2016-09-03 12:35:56 +02:00
Spencer Gibb
0dda21df74
Merge pull request #393 from skhome/364-exception-logging
...
* skhome-364-exception-logging:
Improve logging of JGit exceptions
2016-08-30 13:20:53 -06:00
Sascha Krüger
648f43c22d
Improve logging of JGit exceptions
...
In some situations the JGit library can fail to update the local Git repository.
While the config server should gracefully handle these situations some added
information from the root cause might be helpful to pinpoint why changes in the
remote repository do not get reflected in the REST API.
fixes gh-364
2016-08-30 13:19:16 -06:00
Ryan Baxter
67e8aee2d3
Merge pull request #485 from transamericamoon/svn-label-fix
...
fix svn repo to also check branches and tags folders for label
2016-08-26 14:24:29 -04:00
Spencer Gibb
53e1f4408f
Guard for when result.getPropertySources() is null.
...
fixes gh-488
2016-08-25 11:32:01 -06:00
John Moon
d2ce0e18c1
throw exception if label doesn't exist
2016-08-25 09:20:34 -04:00
Ben Klein
f6ddd58c83
Use reworded note on cloneOnStart
2016-08-24 15:50:29 -07:00
transamericamoon
c0563be4da
nested if statements
2016-08-24 12:31:22 -04:00
Ryan Baxter
812135eec0
Merge pull request #487 from ryanjbaxter/upgrade-bus
...
Upgrade SC Bus Dependency To 1.2.0.BUILD-SNAPSHOT
2016-08-24 09:55:38 -04:00
Ryan Baxter
8e1db67f37
Upgrade SC Bus Dependency To 1.2.0.BUILD-SNAPSHOT. Fixed #486
2016-08-24 09:44:29 -04:00
jmandawg
16bc9d38b9
added unit test for svn label fix
2016-08-23 21:23:33 -04:00
John Moon
67989c78db
fix svn to check branches and tags folder for label
2016-08-23 15:58:48 -04:00
Ryan Baxter
cf4a2992c5
Revert "Updated versions for Camden.M1 release"
...
This reverts commit c99498b82b .
2016-08-22 13:41:44 -04:00
Ryan Baxter
c99498b82b
Updated versions for Camden.M1 release
2016-08-22 13:21:47 -04:00
Marcin Grzejszczak
cdb3dd75a5
Updating ghpages for all projects
2016-08-22 13:31:24 +02:00
Dave Syer
c1f30cc081
Update to release of build parent
2016-08-22 09:38:04 +01:00
Dave Syer
618eef147f
Additional tests for placeholder replacement
...
It turns out that the mechanism we use to convert properties
to YAML (and JSON) means that placeholders are always replaced
if there are defaults (e.g. ${foo:bar} always resolves to "bar"
if "foo" is undefined).
This seems soprt of reasonable, if a little surprising. We could
change the way YAML and JSON are generated, but that would be
a big deal, and probably not worth the effort to fix a bit of
slightly surprising behaviour.
2016-08-22 09:35:34 +01:00
Dave Syer
f8fc4e1937
Omit system properties and env vars from placeholders in config
...
When replacing placeholders in the .yml, .properties and .json
endpoints, only the properties from the config repo (not the
local system and environment variables) ought to be included.
2016-08-22 08:56:18 +01:00
Ben Klein
a31eb66aa0
cloneOnStart helps identify misconf.d conf. source
2016-08-19 16:42:22 -06:00
Spencer Gibb
e431d636f7
formatting
2016-08-19 13:10:09 -06:00
Marcin Grzejszczak
35344624e9
Updating ghpages for all projects
2016-08-19 11:45:23 +02:00
Ryan Baxter
091f07e0df
Updating ghpages script from SC Build
2016-08-18 13:41:52 -04:00
Marcello de Sales
41db12cf7c
Alternative implementation of Source Locator: Authorization
...
This commit adds the Cloud Config Property "authorization", as the HTTP
Authorization header to connect to the client. Users won't be able to
set both the "password" and "authorization" at the same time.
When set, the client will use the value to create a generic
Authorization header with the value provided.
Fixes gh-474
2016-08-18 17:06:13 +01:00
Dave Syer
e1fcd3000a
Update to Boot 1.4 test utils
2016-08-18 16:44:57 +01:00
Marcin Grzejszczak
bc14b6e088
Updating ghpages for all projects
2016-08-18 13:13:55 +02:00
Dave Syer
412e70bc51
Change repo URLs to https
2016-08-17 17:31:22 +01:00
Marcin Grzejszczak
4f0188321b
Updating ghpages for all projects
2016-08-17 12:43:50 +02:00
Dave Syer
37734c0e48
Merge remote-tracking branch 'origin/1.1.x'
2016-08-17 10:34:10 +01:00
Dave Syer
6dd5a54f5e
Fix missing end of sentence
2016-08-17 10:33:15 +01:00