Merge pull request #13232 from Microsoft/10662-zfs

Windows: No ZFS graphdriver
2015-05-15 11:51:48 -07:00 · 2015-05-15 11:51:48 -07:00 · 27b77464d8
parent 0db7365c66 35cdcbb323
commit 27b77464d8
4 changed files with 8 additions and 1 deletions
--- a/daemon/daemon_zfs.go
+++ b/daemon/daemon_zfs.go
@ -1,4 +1,4 @@
-// +build !exclude_graphdriver_zfs
+// +build !exclude_graphdriver_zfs,linux

 package daemon

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

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

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