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

@@ -25,14 +25,14 @@ import (
"testing"
"time"
"k8s.io/client-go/1.5/pkg/api/errors"
_ "k8s.io/client-go/1.5/pkg/api/install" // To register api.Pod used in tests below
"k8s.io/client-go/1.5/pkg/api/unversioned"
"k8s.io/client-go/1.5/pkg/api/v1"
k8sruntime "k8s.io/client-go/1.5/pkg/runtime"
"k8s.io/client-go/1.5/pkg/util/clock"
"k8s.io/client-go/1.5/pkg/util/strategicpatch"
"k8s.io/client-go/1.5/rest"
"k8s.io/client-go/pkg/api/errors"
_ "k8s.io/client-go/pkg/api/install" // To register api.Pod used in tests below
"k8s.io/client-go/pkg/api/unversioned"
"k8s.io/client-go/pkg/api/v1"
k8sruntime "k8s.io/client-go/pkg/runtime"
"k8s.io/client-go/pkg/util/clock"
"k8s.io/client-go/pkg/util/strategicpatch"
"k8s.io/client-go/rest"
)
type testEventSink struct {