From 66eadb514a4e8ccc74031aea0aac6369fb000319 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 19 Sep 2014 11:00:17 -0700 Subject: [PATCH] fix rebase issue. --- pkg/api/v1beta2/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index 4816d5f590e..77feef0dfc7 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -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{}