github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18353 from deads2k/gv-use-constants

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-15 03:25:09 -08:00
parent 25acc9bafa d0aaf13920
commit 3680268c52
59 changed files with 191 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/cmd/util/helpers.go
View File

@@ -28,6 +28,7 @@ import (
"strings"
"time"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/unversioned"
@@ -380,7 +381,7 @@ func Merge(dst runtime.Object, fragment, kind string) (runtime.Object, error) {
return nil, err
}
i, err := latest.GroupOrDie("").InterfacesFor(groupVersion)
i, err := latest.GroupOrDie(api.GroupName).InterfacesFor(groupVersion)
if err != nil {
return nil, err
}