github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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

6
test/e2e/framework/framework.go
View File

@@ -26,9 +26,9 @@ import (
"sync"
"time"
staging "k8s.io/client-go/1.4/kubernetes"
"k8s.io/client-go/1.4/pkg/util/sets"
clientreporestclient "k8s.io/client-go/1.4/rest"
staging "k8s.io/client-go/1.5/kubernetes"
"k8s.io/client-go/1.5/pkg/util/sets"
clientreporestclient "k8s.io/client-go/1.5/rest"
"k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors"