p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13965 from cpuguy83/fix_windows_vfs_import

Browse Source 
Fix circular import for windows vfs graphdriver
Upstream-commit: de6e6d4b281709033c44d197a9e46323f38928f1
Component: engine
This commit is contained in:
Tibor Vass
2015-06-16 12:32:24 -04:00
parent a540cd0042 1868142b6e
commit 932e8a3e7e
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/daemon/daemon.go
View File

@ -19,6 +19,7 @@ import (
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/daemon/execdriver/execdrivers"
"github.com/docker/docker/daemon/graphdriver"
_ "github.com/docker/docker/daemon/graphdriver/vfs"
"github.com/docker/docker/daemon/logger"
"github.com/docker/docker/daemon/network"
"github.com/docker/docker/graph"

1
components/engine/daemon/daemon_unix.go
View File

@ -13,7 +13,6 @@ import (
"github.com/Sirupsen/logrus"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/daemon/graphdriver"
_ "github.com/docker/docker/daemon/graphdriver/vfs"
"github.com/docker/docker/graph"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/fileutils"

6
components/engine/daemon/graphdriver/driver_windows.go
View File

@ -1,11 +1,5 @@
package graphdriver
import (
_ "github.com/docker/docker/daemon/graphdriver/vfs"
// TODO Windows - Add references to real graph driver when PR'd
)
type DiffDiskDriver interface {
Driver
CopyDiff(id, sourceId string) error