github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83956 from liggitt/intstr-type

Browse Source 
Fix proto.Merge of IntOrString type
This commit is contained in:
Kubernetes Prow Robot
2019-10-16 11:37:44 -07:00
committed by GitHub
parent 0e2383df15 2563c04158
commit 554412c62c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go
View File

@@ -45,7 +45,7 @@ type IntOrString struct {
} }
// Type represents the stored type of IntOrString. // Type represents the stored type of IntOrString.
type Type int type Type int64
const ( const (
Int Type = iota // The IntOrString holds an int. Int Type = iota // The IntOrString holds an int.