Merge pull request #16849 from feihujiang/cleanupDeprecatedV1beta1Content

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-07 04:15:32 -08:00
12 changed files with 16 additions and 48 deletions

View File

@@ -1145,7 +1145,6 @@ type ReplicationControllerSpec struct {
// Template is the object that describes the pod that will be created if
// insufficient replicas are detected. Internally, this takes precedence over a
// TemplateRef.
// Must be set before converting to a v1beta1 or v1beta2 API object.
Template *PodTemplateSpec `json:"template,omitempty"`
}