github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32906 from caesarxuchao/staging-1.5

Browse Source 
Automatic merge from submit-queue

Staging 1.5 client

Created the 1.5 folder and remove the 1.4 folder in the staging area in the master branch.

Content of kubernetes/client-go/1.4 will be pulled from the kubernetes/kubernetes 1.4 branch (https://github.com/kubernetes/contrib/pull/1719)
This commit is contained in:
Kubernetes Submit Queue
2016-09-22 19:55:01 -07:00
committed by GitHub
parent 1f7e79afbf a4e62297d6
commit 1ef86aa8ab
1200 changed files with 158076 additions and 19409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/pkg/client/auth/gcp/gcp.go
View File

@@ -25,7 +25,7 @@ import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
clientreporestclient "k8s.io/client-go/1.4/rest"
clientreporestclient "k8s.io/client-go/1.5/rest"
"k8s.io/kubernetes/pkg/client/restclient"
)