From 37bda2dbf28f7dd416e624f912d3f3b17964d373 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 28 Jun 2016 22:07:06 -0700 Subject: [PATCH] Move hacked golang os code to forked/ dir --- pkg/kubelet/container/helpers.go | 2 +- pkg/kubelet/kubelet.go | 2 +- third_party/{golang => forked}/expansion/expand.go | 0 third_party/{golang => forked}/expansion/expand_test.go | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename third_party/{golang => forked}/expansion/expand.go (100%) rename third_party/{golang => forked}/expansion/expand_test.go (100%) diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index ed0311df2a8..91b4645a711 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" hashutil "k8s.io/kubernetes/pkg/util/hash" - "k8s.io/kubernetes/third_party/golang/expansion" + "k8s.io/kubernetes/third_party/forked/expansion" "github.com/golang/glog" ) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 4f897185166..309ff0b9562 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -97,7 +97,7 @@ import ( "k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" - "k8s.io/kubernetes/third_party/golang/expansion" + "k8s.io/kubernetes/third_party/forked/expansion" ) const ( diff --git a/third_party/golang/expansion/expand.go b/third_party/forked/expansion/expand.go similarity index 100% rename from third_party/golang/expansion/expand.go rename to third_party/forked/expansion/expand.go diff --git a/third_party/golang/expansion/expand_test.go b/third_party/forked/expansion/expand_test.go similarity index 100% rename from third_party/golang/expansion/expand_test.go rename to third_party/forked/expansion/expand_test.go