published by bot

(https://github.com/kubernetes/contrib/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is e56cfc5322138aa23e6418ee30a6ab54c7c6fe8c
This commit is contained in:
Kubernetes Publisher
2016-10-21 04:44:19 +00:00
parent c72e2838b9
commit 75399f68c8
636 changed files with 83827 additions and 63845 deletions

View File

@@ -30,13 +30,13 @@ import (
"github.com/golang/glog"
"github.com/imdario/mergo"
"k8s.io/client-go/1.5/pkg/api/unversioned"
"k8s.io/client-go/1.5/pkg/runtime"
utilerrors "k8s.io/client-go/1.5/pkg/util/errors"
"k8s.io/client-go/1.5/pkg/util/homedir"
"k8s.io/client-go/1.5/rest"
clientcmdapi "k8s.io/client-go/1.5/tools/clientcmd/api"
clientcmdlatest "k8s.io/client-go/1.5/tools/clientcmd/api/latest"
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/runtime"
utilerrors "k8s.io/client-go/pkg/util/errors"
"k8s.io/client-go/pkg/util/homedir"
"k8s.io/client-go/rest"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
clientcmdlatest "k8s.io/client-go/tools/clientcmd/api/latest"
)
const (