Merge pull request kubernetes#24748 from Random-Liu/cleanup-with-new-…

…engine-api Automatic merge from submit-queue Kubelet: Cleanup with new engine api Finish step 2 of kubernetes#23563 This PR: 1) Cleanup go-dockerclient reference in the code. 2) Bump up the engine-api version. 3) Cleanup the code with new engine-api. Fixes kubernetes#24076. Fixes kubernetes#23809. /cc @yujuhong
dmatch01 · May 6, 2016 · 346ddc5 · 346ddc5
2 parents 60324ff + 7796b61
commit 346ddc5
Show file tree

Hide file tree

Showing 57 changed files with 603 additions and 377 deletions.
diff --git a/Godeps/.license_file_state b/Godeps/.license_file_state
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/client.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/client_unix.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/client_unix.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_attach.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_attach.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_commit.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_commit.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_copy.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_copy.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_exec.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_exec.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_export.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_export.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_list.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_list.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_logs.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_logs.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_remove.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_remove.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_resize.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_resize.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/container_wait.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/container_wait.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/errors.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/errors.go
diff --git a/Godeps/_workspace/src/github.com/docker/engine-api/client/hijack.go b/Godeps/_workspace/src/github.com/docker/engine-api/client/hijack.go