github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2026-04-12 00:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #63448 from dims/automated-cherry-pick-of-#62505-upstream-release-1.10

Browse Source 
Automatic merge from submit-queue.

Automated cherry pick of #62505: update godeps to use latest pflag

Cherry pick of #62505 on release-1.10.

#62505: update godeps to use latest pflag

```release-note
Show help for deprecated Kubelet flags
```

Kubernetes-commit: 8959a0aa87adf07c4ff821bf6d79714b3d615e8a
This commit is contained in:
Kubernetes Publisher
2018-06-01 05:58:03 -07:00
parent c8c875a7f5 e45527e48e
commit 36dfe2e210
14 changed files with 878 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/github.com/spf13/pflag/golangflag.go
Generated Vendored
+4
View File
@@ -98,4 +98,8 @@ func (f *FlagSet) AddGoFlagSet(newSet *goflag.FlagSet) {
newSet.VisitAll(func(goflag *goflag.Flag) {
f.AddGoFlag(goflag)
})
if f.addedGoFlagSets == nil {
f.addedGoFlagSets = make([]*goflag.FlagSet, 0)
}
f.addedGoFlagSets = append(f.addedGoFlagSets, newSet)
}