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

Move hacked golang os code to forked/ dir

Browse Source
This commit is contained in:
Tim Hockin
2016-06-28 22:07:06 -07:00
parent b3d6bf0dbe
commit 37bda2dbf2
4 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/container/helpers.go
View File

@@ -27,7 +27,7 @@ import (
"k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/types"
hashutil "k8s.io/kubernetes/pkg/util/hash" 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" "github.com/golang/glog"
) )

2
pkg/kubelet/kubelet.go
View File

@@ -97,7 +97,7 @@ import (
"k8s.io/kubernetes/pkg/watch" "k8s.io/kubernetes/pkg/watch"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates"
"k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache"
"k8s.io/kubernetes/third_party/golang/expansion" "k8s.io/kubernetes/third_party/forked/expansion"
) )
const ( const (

0
third_party/golang/expansion/expand.go → third_party/forked/expansion/expand.go vendored
View File

0
third_party/golang/expansion/expand_test.go → third_party/forked/expansion/expand_test.go vendored
View File