Merge pull request #5477 from dchen1107/clean

Convert RestartPolicy to string for v1beta3.
2015-03-16 10:23:52 -07:00
parent 2a8528704a 34e9c82c70
commit e37fd2a84d
29 changed files with 184 additions and 258 deletions
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -627,7 +627,7 @@ func runServiceTest(client *client.Client) {
 					ImagePullPolicy: "PullIfNotPresent",
 				},
 			},
-			RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
+			RestartPolicy: api.RestartPolicyAlways,
 			DNSPolicy:     api.DNSClusterFirst,
 		},
 		Status: api.PodStatus{