fix rebase issue.

This commit is contained in:
Dawn Chen 2014-09-19 11:00:17 -07:00
parent 0e6ec3cbfc
commit 66eadb514a

View File

@ -298,7 +298,7 @@ type ContainerStatus struct {
// PodInfo contains one entry for every container with available info.
// TODO(dchen1107): Replace docker.Container below with ContainerStatus defined above.
type PodInfo map[string]docker.Container
type PodInfo map[string]ContainerStatus
type RestartPolicyAlways struct{}