github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40170 from deads2k/client-10-restclient

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 36693, 40154, 40170, 39033)

make client-go authoritative for pkg/client/restclient

Moves client/restclient to client-go and a util/certs, util/testing as transitives.
This commit is contained in:
Kubernetes Submit Queue
2017-01-20 09:18:52 -08:00
committed by GitHub
parent 49cb10c843 9c6a522882
commit 22a405055d
703 changed files with 3305 additions and 12132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go
View File

@@ -24,9 +24,9 @@ import (
"time"
"github.com/golang/glog"
restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/api"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"k8s.io/kubernetes/pkg/client/restclient"
)
func flattenSubsets(subsets []api.EndpointSubset) []string {