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).

Merge pull request #39714 from feiskyer/fix
cd55e1b2 · Kubernetes Submit Queue · GitHub · ba611194 · 1f17a47f · cd55e1b2
Commit cd55e1b2 authored Jan 11, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

docker_manager_unsupported.go pkg/kubelet/dockertools/docker_manager_unsupported.go +1 -0

No files found.
--- a/pkg/kubelet/dockertools/docker_manager_unsupported.go
+++ b/pkg/kubelet/dockertools/docker_manager_unsupported.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/v1"

 	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)