reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.1'

Browse Source
This commit is contained in:
Adam Harrison committed 2015-09-10 17:24:26 +01:00
2 parents 4ded1f6193 ac145052d6
commit 3d4a8aaad1
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
weave
+1 -1
View File
@@ -1074,7 +1074,7 @@ proxy_addr() {
warn_if_stopping_proxy_in_env() {
if PROXY_ADDR=$(proxy_addr 2>/dev/null) ; then
[ "$PROXY_ADDR" != "$DOCKER_CLIENT_HOST" ] || echo "WARNING: It appears that your environment is configured to use the Weave Docker API proxy. Stopping it will break this and subsequent docker invocations. To restore your environment, run '\$(eval weave env --restore)'."
[ "$PROXY_ADDR" != "$DOCKER_CLIENT_HOST" ] || echo "WARNING: It appears that your environment is configured to use the Weave Docker API proxy. Stopping it will break this and subsequent docker invocations. To restore your environment, run 'eval \$(weave env --restore)'."
fi
}