瀏覽代碼

Vendor engine-api 0.3.1.

Signed-off-by: David Calavera <david.calavera@gmail.com>
(cherry picked from commit 58385bc8a51e538f64a0d91c3259f20c6c289c86)
David Calavera 9 年之前
父節點
當前提交
8c390f0987
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 1 1
      hack/vendor.sh
  2. 6 2
      vendor/src/github.com/docker/engine-api/client/client.go

+ 1 - 1
hack/vendor.sh

@@ -24,7 +24,7 @@ clone git golang.org/x/net 47990a1ba55743e6ef1affd3a14e5bac8553615d https://gith
 clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git
 clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
 clone git github.com/docker/go-connections v0.2.0
-clone git github.com/docker/engine-api v0.3.0
+clone git github.com/docker/engine-api v0.3.1
 clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837
 clone git github.com/imdario/mergo 0.2.1
 

+ 6 - 2
vendor/src/github.com/docker/engine-api/client/client.go

@@ -97,10 +97,14 @@ func (cli *Client) getAPIPath(p string, query url.Values) string {
 	} else {
 		apiPath = fmt.Sprintf("%s%s", cli.basePath, p)
 	}
+
+	u := &url.URL{
+		Path: apiPath,
+	}
 	if len(query) > 0 {
-		apiPath += "?" + query.Encode()
+		u.RawQuery = query.Encode()
 	}
-	return apiPath
+	return u.String()
 }
 
 // ClientVersion returns the version string associated with this