Merge remote-tracking branch 'origin/1.1.x'

2016-08-17 10:34:10 +01:00
parent 8d4667a964 6dd5a54f5e
commit 37734c0e48
1 changed files with 3 additions and 1 deletions
--- a/docs/src/main/asciidoc/spring-cloud-config.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-config.adoc
@@ -578,7 +578,9 @@ configure the overrides on the server.

 You can change the priority of all overrides in the client to be more
 like default values, allowing applications to supply their own values
-in environment variables or System properties, by setting the flag `
+in environment variables or System properties, by setting the flag
+`spring.cloud.config.overrideNone=true` (default is false) in the
+remote repository.

 === Health Indicator