Merge pull request #5477 from dchen1107/clean

Convert RestartPolicy to string for v1beta3.
This commit is contained in:
Jeff Lowdermilk
2015-03-16 10:23:52 -07:00
29 changed files with 184 additions and 258 deletions

View File

@@ -391,7 +391,7 @@ func TestPodPhaseWithBadNode(t *testing.T) {
{Name: "containerA"},
{Name: "containerB"},
},
RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
RestartPolicy: api.RestartPolicyAlways,
}
runningState := api.ContainerStatus{
State: api.ContainerState{