Merge pull request #12782 from aveshagarwal/master-1413748-12712

OpenShift Bot · web-flow · commit 7987f85b5e17 · 2017-02-04T00:01:29.000-05:00
Merged by openshift-bot
diff --git a/pkg/cmd/server/start/admission.go b/pkg/cmd/server/start/admission.go
@@ -65,7 +65,6 @@ var (
 		"LimitRanger",
 		"ServiceAccount",
 		"SecurityContextConstraint",
-		"LimitPodHardAntiAffinityTopology",
 		"SCCExecRestrictions",
 		"PersistentVolumeLabel",
 		"DefaultStorageClass",
@@ -85,6 +84,7 @@ var (
 		"AlwaysPullImages",
 		"ImagePolicyWebhook",
 		"openshift.io/RestrictSubjectBindings",
+		"LimitPodHardAntiAffinityTopology",
 	)
 )
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@ var (`
`65`	`65`	`"LimitRanger",`
`66`	`66`	`"ServiceAccount",`
`67`	`67`	`"SecurityContextConstraint",`
`68`		`- "LimitPodHardAntiAffinityTopology",`
`69`	`68`	`"SCCExecRestrictions",`
`70`	`69`	`"PersistentVolumeLabel",`
`71`	`70`	`"DefaultStorageClass",`
`@@ -85,6 +84,7 @@ var (`
`85`	`84`	`"AlwaysPullImages",`
`86`	`85`	`"ImagePolicyWebhook",`
`87`	`86`	`"openshift.io/RestrictSubjectBindings",`
	`87`	`+ "LimitPodHardAntiAffinityTopology",`
`88`	`88`	`)`
`89`	`89`	`)`
`90`	`90`