From 7a5d8974109ec34e9fb752b2935077eb8da7a229 Mon Sep 17 00:00:00 2001
From: David Calavera <david.calavera@gmail.com>
Date: Wed, 13 Jan 2016 19:58:40 -0500
Subject: [PATCH] Vendor engine-api 0.2.2.

Signed-off-by: David Calavera <david.calavera@gmail.com>
---
 hack/vendor.sh                                            | 2 +-
 vendor/src/github.com/docker/engine-api/client/client.go  | 3 +--
 .../github.com/docker/engine-api/types/filters/parse.go   | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/hack/vendor.sh b/hack/vendor.sh
index 9e94cfc596..a74d55133a 100755
--- a/hack/vendor.sh
+++ b/hack/vendor.sh
@@ -22,7 +22,7 @@ clone git github.com/vdemeester/shakers 3c10293ce22b900c27acad7b28656196fcc2f73b
 clone git golang.org/x/net 47990a1ba55743e6ef1affd3a14e5bac8553615d https://github.com/golang/net.git
 clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
 clone git github.com/docker/go-connections v0.1.2
-clone git github.com/docker/engine-api v0.2.1
+clone git github.com/docker/engine-api v0.2.2
 clone git github.com/RackSec/srslog 6eb773f331e46fbba8eecb8e794e635e75fc04de
 
 #get libnetwork packages
diff --git a/vendor/src/github.com/docker/engine-api/client/client.go b/vendor/src/github.com/docker/engine-api/client/client.go
index 061fd55daf..28f00e5669 100644
--- a/vendor/src/github.com/docker/engine-api/client/client.go
+++ b/vendor/src/github.com/docker/engine-api/client/client.go
@@ -65,7 +65,6 @@ func NewEnvClient() (*Client, error) {
 func NewClient(host string, version string, transport *http.Transport, httpHeaders map[string]string) (*Client, error) {
 	var (
 		basePath       string
-		tlsConfig      *tls.Config
 		scheme         = "http"
 		protoAddrParts = strings.SplitN(host, "://", 2)
 		proto, addr    = protoAddrParts[0], protoAddrParts[1]
@@ -90,7 +89,7 @@ func NewClient(host string, version string, transport *http.Transport, httpHeade
 		addr:              addr,
 		basePath:          basePath,
 		scheme:            scheme,
-		tlsConfig:         tlsConfig,
+		tlsConfig:         transport.TLSClientConfig,
 		httpClient:        &http.Client{Transport: transport},
 		version:           version,
 		customHTTPHeaders: httpHeaders,
diff --git a/vendor/src/github.com/docker/engine-api/types/filters/parse.go b/vendor/src/github.com/docker/engine-api/types/filters/parse.go
index e99462c0a8..9c80b1eddb 100644
--- a/vendor/src/github.com/docker/engine-api/types/filters/parse.go
+++ b/vendor/src/github.com/docker/engine-api/types/filters/parse.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 )
 
-// Args stores filter arguments as map key:{array of values}.
-// It contains a aggregation of the list of arguments (which are in the form
+// Args stores filter arguments as map key:{map key: bool}.
+// It contains a aggregation of the map of arguments (which are in the form
 // of -f 'key=value') based on the key, and store values for the same key
-// in an slice.
+// in an map with string keys and boolean values.
 // e.g given -f 'label=label1=1' -f 'label=label2=2' -f 'image.name=ubuntu'
-// the args will be {'label': {'label1=1','label2=2'}, 'image.name', {'ubuntu'}}
+// the args will be {"image.name":{"ubuntu":true},"label":{"label1=1":true,"label2=2":true}}
 type Args struct {
 	fields map[string]map[string]bool
 }