github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/util: move uuid and strategicpatch into k8s.io/apimachinery

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-01-24 15:35:22 +01:00
parent fb60807040
commit d7eb3b6870
88 changed files with 103 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet_node_status_test.go
View File

@@ -33,6 +33,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/rand"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
@@ -41,8 +43,6 @@ import (
"k8s.io/kubernetes/pkg/client/testing/core"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
"k8s.io/kubernetes/pkg/util/strategicpatch"
"k8s.io/kubernetes/pkg/util/uuid"
"k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/pkg/volume/util/volumehelper"
)