github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rebase issues.

Browse Source
This commit is contained in:
Dawn Chen
2014-10-03 12:12:17 -07:00
parent 8d0ed93aa1
commit 39f648bda2
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/dockertools/docker.go
View File

@@ -44,7 +44,6 @@ type DockerContainerData struct {
type DockerInterface interface {
ListContainers(options docker.ListContainersOptions) ([]docker.APIContainers, error)
InspectContainer(id string) (*docker.Container, error)
InspectImage(name string) (*docker.Image, error)
CreateContainer(docker.CreateContainerOptions) (*docker.Container, error)
StartContainer(id string, hostConfig *docker.HostConfig) error
StopContainer(id string, timeout uint) error