Skip to content

K
k3s
Commit cd55e1b2 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #39714 from feiskyer/fix

Automatic merge from submit-queue (batch tested with PRs 39714, 39646) dockertools: fix build on OSX #39005 introduces a build problem on OSX. This PR fixes it. Refer [here](https://github.com/kubernetes/kubernetes/pull/39005#issuecomment-271781026).
parents ba611194 1f17a47f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
pkg/kubelet/dockertools/docker_manager_unsupported.go
View file @ cd55e1b2
...@@ -22,6 +22,7 @@ import ( ...@@ -22,6 +22,7 @@ import (
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
dockertypes "github.com/docker/engine-api/types" dockertypes "github.com/docker/engine-api/types"
dockercontainer "github.com/docker/engine-api/types/container"
) )
// These two functions are OS specific (for now at least) // These two functions are OS specific (for now at least)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment