From c79ba1a4656488da0405b31906f91e409daba016 Mon Sep 17 00:00:00 2001
From: buildmaster
Date: Wed, 17 Aug 2016 09:34:17 +0000
Subject: [PATCH] Sync docs from 1.1.x to gh-pages
---
1.1.x/index.html | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/1.1.x/index.html b/1.1.x/index.html
index 769fda21..a979e984 100644
--- a/1.1.x/index.html
+++ b/1.1.x/index.html
@@ -1268,7 +1268,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.
@@ -2055,7 +2057,7 @@ grabbing it in the bootstrap context and injecting one).