Merge pull request #83956 from liggitt/intstr-type

Fix proto.Merge of IntOrString type
2019-10-16 11:37:44 -07:00
parent 0e2383df15 2563c04158
commit 554412c62c
1 changed files with 1 additions and 1 deletions
--- a/staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go
@@ -45,7 +45,7 @@ type IntOrString struct {
 }

 // Type represents the stored type of IntOrString.
-type Type int
+type Type int64

 const (
 	Int    Type = iota // The IntOrString holds an int.