Merge pull request #16330 from mikedanese/deploy-ptr

Auto commit by PR queue bot
2015-11-02 20:41:34 -08:00
parent 1415f7509b 6bbc2448c9
commit 990c0184be
18 changed files with 7411 additions and 7470 deletions
--- a/pkg/registry/deployment/etcd/etcd_test.go
+++ b/pkg/registry/deployment/etcd/etcd_test.go
@@ -48,7 +48,7 @@ func validNewDeployment() *extensions.Deployment {
 		},
 		Spec: extensions.DeploymentSpec{
 			Selector: map[string]string{"a": "b"},
-			Template: &api.PodTemplateSpec{
+			Template: api.PodTemplateSpec{
 				ObjectMeta: api.ObjectMeta{
 					Labels: map[string]string{"a": "b"},
 				},