From 6044354ea2ccbc3589fdd9fcddfa9b50f5666a42 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Wed, 11 Mar 2015 14:10:18 -0700
Subject: [PATCH] update Godeps

Signed-off-by: Victor Vieux <vieux@docker.com>
---
 Godeps/Godeps.json                                  |  2 +-
 .../github.com/samalba/dockerclient/dockerclient.go | 13 ++++++++++---
 .../github.com/samalba/dockerclient/interface.go    |  2 +-
 .../samalba/dockerclient/mockclient/mock.go         |  4 ++--
 .../src/github.com/samalba/dockerclient/types.go    |  5 +++++
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index fbdd79993b..d3b9bb334d 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -60,7 +60,7 @@
 		},
 		{
 			"ImportPath": "github.com/samalba/dockerclient",
-			"Rev": "0fdc3ca0e58365801f1212900def9c7c60bbe2c7"
+			"Rev": "0689bcd74173c6abd6394b7ad435df46b0df26f8"
 		},
 		{
 			"ImportPath": "github.com/samuel/go-zookeeper/zk",
diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go
index 81e6aaeaa0..630672a771 100644
--- a/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go
+++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/dockerclient.go
@@ -333,10 +333,17 @@ func (client *DockerClient) ListImages() ([]*Image, error) {
 	return images, nil
 }
 
-func (client *DockerClient) RemoveImage(name string) error {
+func (client *DockerClient) RemoveImage(name string) ([]*ImageDelete, error) {
 	uri := fmt.Sprintf("/%s/images/%s", APIVersion, name)
-	_, err := client.doRequest("DELETE", uri, nil, nil)
-	return err
+	data, err := client.doRequest("DELETE", uri, nil, nil)
+	if err != nil {
+		return nil, err
+	}
+	var imageDelete []*ImageDelete
+	if err := json.Unmarshal(data, &imageDelete); err != nil {
+		return nil, err
+	}
+	return imageDelete, nil
 }
 
 func (client *DockerClient) PauseContainer(id string) error {
diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go
index bab13aa3ea..ef6684eeb8 100644
--- a/Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go
+++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/interface.go
@@ -23,7 +23,7 @@ type Client interface {
 	PullImage(name string, auth *AuthConfig) error
 	RemoveContainer(id string, force, volumes bool) error
 	ListImages() ([]*Image, error)
-	RemoveImage(name string) error
+	RemoveImage(name string) ([]*ImageDelete, error)
 	PauseContainer(name string) error
 	UnpauseContainer(name string) error
 }
diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go
index 4d16dcaa93..5ff76db313 100644
--- a/Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go
+++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/mockclient/mock.go
@@ -88,9 +88,9 @@ func (client *MockClient) ListImages() ([]*dockerclient.Image, error) {
 	return args.Get(0).([]*dockerclient.Image), args.Error(1)
 }
 
-func (client *MockClient) RemoveImage(name string) error {
+func (client *MockClient) RemoveImage(name string) ([]*dockerclient.ImageDelete, error) {
 	args := client.Mock.Called(name)
-	return args.Error(0)
+	return args.Get(0).([]*dockerclient.ImageDelete), args.Error(1)
 }
 
 func (client *MockClient) PauseContainer(name string) error {
diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go
index 6504e8fa3b..a3dcd123fa 100644
--- a/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go
+++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go
@@ -166,3 +166,8 @@ type Info struct {
 	Name            string
 	Labels          []string
 }
+
+type ImageDelete struct {
+	Deleted  string
+	Untagged string
+}