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

2
pkg/controller/deployment/deployment_controller_test.go
View File

@@ -24,6 +24,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
@@ -34,7 +35,6 @@ import (
"k8s.io/kubernetes/pkg/controller/deployment/util"
"k8s.io/kubernetes/pkg/controller/informers"
"k8s.io/kubernetes/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/uuid"
)
var (