github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues 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
commit 554412c62c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats 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.