Merge pull request #3827 from brendandburns/sanity

Fix unit tests @ main on OS X

Merge pull request #3827 from brendandburns/sanity
60eba74c · Tim Hockin · 95247b31 · e5c38a82 · 60eba74c · 60eba74c
Commit 60eba74c authored Jan 26, 2015 by Tim Hockin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mount_util_unix.go pkg/kubelet/volume/gce_pd/mount_util_unix.go +0 -0

mount_util_unsupported.go pkg/kubelet/volume/gce_pd/mount_util_unsupported.go +1 -1

No files found.
--- a/pkg/kubelet/volume/gce_pd/mount_util_linux.go
+++ b/pkg/kubelet/volume/gce_pd/mount_util_linux.go
--- a/pkg/kubelet/volume/gce_pd/mount_util_unsupported.go
+++ b/pkg/kubelet/volume/gce_pd/mount_util_unsupported.go
-// +build !linux
+// +build windows

 /*
 Copyright 2014 Google Inc. All rights reserved.