Merge branch '1.4'

2016-01-03 16:45:41 +00:00
commit c3e6669d18
@@ -1440,7 +1440,7 @@ proxy_args() {
            echo "'weave launch-proxy' and supply '--no-detect-tls' or TLS options." >&2
            exit 1
        fi
-        proxy_parse_args "$DOCKER_TLS_ARGS"
+        proxy_parse_args $DOCKER_TLS_ARGS
    fi
    if [ -z "$PROXY_HOST" ] ; then
      case "$DOCKER_CLIENT_HOST" in