Merge pull request #13232 from Microsoft/10662-zfs

Windows: No ZFS graphdriver Upstream-commit: 27b77464d8ad883a28c0936a8b33affb6168647e Component: engine
2015-05-15 11:51:48 -07:00
parent 36f868037d 4a6cf355cf
commit 7bcf0fc7df
4 changed files with 8 additions and 1 deletions
--- a/components/engine/daemon/daemon_zfs.go
+++ b/components/engine/daemon/daemon_zfs.go
@ -1,4 +1,4 @@
-// +build !exclude_graphdriver_zfs
+// +build !exclude_graphdriver_zfs,linux

 package daemon

--- a/components/engine/daemon/graphdriver/zfs/zfs.go
+++ b/components/engine/daemon/graphdriver/zfs/zfs.go
@ -1,3 +1,5 @@
+// +build linux
+
 package zfs

 import (
--- a/components/engine/daemon/graphdriver/zfs/zfs_test.go
+++ b/components/engine/daemon/graphdriver/zfs/zfs_test.go
@ -1,3 +1,5 @@
+// +build linux
+
 package zfs

 import (
--- a/components/engine/daemon/graphdriver/zfs/zfs_unsupported.go
+++ b/components/engine/daemon/graphdriver/zfs/zfs_unsupported.go
@ -0,0 +1,3 @@
+// +build !linux
+
+package zfs