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

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

View File

@@ -27,10 +27,10 @@ import (
"github.com/golang/glog"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/pkg/util/strategicpatch"
)
const (