Merge pull request flynn#559 from flynn/godeps-fork-docker

Godeps: Switch to fork of github.com/docker/docker
tlperkins · Dec 6, 2014 · a8fb8b9 · a8fb8b9
2 parents 3dda09a + b8a5b1a
commit a8fb8b9
Show file tree

Hide file tree

Showing 209 changed files with 380 additions and 304 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/archive.go b/Godeps/_workspace/src/github.com/docker/docker/archive/archive.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/archive_test.go b/Godeps/_workspace/src/github.com/docker/docker/archive/archive_test.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/changes.go b/Godeps/_workspace/src/github.com/docker/docker/archive/changes.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/diff.go b/Godeps/_workspace/src/github.com/docker/docker/archive/diff.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/archive/wrap.go b/Godeps/_workspace/src/github.com/docker/docker/archive/wrap.go
diff --git a/...ps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs_test.go b/...ps/_workspace/src/github.com/docker/docker/daemon/graphdriver/overlayfs/overlayfs_test.go
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive_test.go b/Godeps/_workspace/src/github.com/docker/docker/pkg/chrootarchive/archive_test.go
diff --git a/...er/docker/daemon/graphdriver/aufs/aufs.go → ...nn/docker/daemon/graphdriver/aufs/aufs.go b/...er/docker/daemon/graphdriver/aufs/aufs.go → ...nn/docker/daemon/graphdriver/aufs/aufs.go
diff --git a/...cker/daemon/graphdriver/aufs/aufs_test.go → ...cker/daemon/graphdriver/aufs/aufs_test.go b/...cker/daemon/graphdriver/aufs/aufs_test.go → ...cker/daemon/graphdriver/aufs/aufs_test.go
diff --git a/...er/docker/daemon/graphdriver/aufs/dirs.go → ...nn/docker/daemon/graphdriver/aufs/dirs.go b/...er/docker/daemon/graphdriver/aufs/dirs.go → ...nn/docker/daemon/graphdriver/aufs/dirs.go
diff --git a/...docker/daemon/graphdriver/aufs/migrate.go → ...docker/daemon/graphdriver/aufs/migrate.go b/...docker/daemon/graphdriver/aufs/migrate.go → ...docker/daemon/graphdriver/aufs/migrate.go
diff --git a/...r/docker/daemon/graphdriver/aufs/mount.go → ...n/docker/daemon/graphdriver/aufs/mount.go b/...r/docker/daemon/graphdriver/aufs/mount.go → ...n/docker/daemon/graphdriver/aufs/mount.go
diff --git a/...er/daemon/graphdriver/aufs/mount_linux.go → ...er/daemon/graphdriver/aufs/mount_linux.go b/...er/daemon/graphdriver/aufs/mount_linux.go → ...er/daemon/graphdriver/aufs/mount_linux.go
diff --git a/...mon/graphdriver/aufs/mount_unsupported.go → ...mon/graphdriver/aufs/mount_unsupported.go b/...mon/graphdriver/aufs/mount_unsupported.go → ...mon/graphdriver/aufs/mount_unsupported.go
diff --git a/...cker/daemon/graphdriver/btrfs/MAINTAINERS → ...cker/daemon/graphdriver/btrfs/MAINTAINERS b/...cker/daemon/graphdriver/btrfs/MAINTAINERS → ...cker/daemon/graphdriver/btrfs/MAINTAINERS
diff --git a/.../docker/daemon/graphdriver/btrfs/btrfs.go → .../docker/daemon/graphdriver/btrfs/btrfs.go b/.../docker/daemon/graphdriver/btrfs/btrfs.go → .../docker/daemon/graphdriver/btrfs/btrfs.go
diff --git a/...er/daemon/graphdriver/btrfs/btrfs_test.go → ...er/daemon/graphdriver/btrfs/btrfs_test.go b/...er/daemon/graphdriver/btrfs/btrfs_test.go → ...er/daemon/graphdriver/btrfs/btrfs_test.go
diff --git a/...on/graphdriver/btrfs/dummy_unsupported.go → ...on/graphdriver/btrfs/dummy_unsupported.go b/...on/graphdriver/btrfs/dummy_unsupported.go → ...on/graphdriver/btrfs/dummy_unsupported.go
diff --git a/.../daemon/graphdriver/btrfs/version_none.go → .../daemon/graphdriver/btrfs/version_none.go b/.../daemon/graphdriver/btrfs/version_none.go → .../daemon/graphdriver/btrfs/version_none.go
diff --git a/.../daemon/graphdriver/btrfs/version_test.go → .../daemon/graphdriver/btrfs/version_test.go b/.../daemon/graphdriver/btrfs/version_test.go → .../daemon/graphdriver/btrfs/version_test.go
diff --git a/.../daemon/graphdriver/devmapper/MAINTAINERS → .../daemon/graphdriver/devmapper/MAINTAINERS b/.../daemon/graphdriver/devmapper/MAINTAINERS → .../daemon/graphdriver/devmapper/MAINTAINERS
diff --git a/...er/daemon/graphdriver/devmapper/README.md → ...er/daemon/graphdriver/devmapper/README.md b/...er/daemon/graphdriver/devmapper/README.md → ...er/daemon/graphdriver/devmapper/README.md
diff --git a/...daemon/graphdriver/devmapper/deviceset.go → ...daemon/graphdriver/devmapper/deviceset.go b/...daemon/graphdriver/devmapper/deviceset.go → ...daemon/graphdriver/devmapper/deviceset.go
diff --git a/...on/graphdriver/devmapper/devmapper_doc.go → ...on/graphdriver/devmapper/devmapper_doc.go b/...on/graphdriver/devmapper/devmapper_doc.go → ...on/graphdriver/devmapper/devmapper_doc.go
diff --git a/...n/graphdriver/devmapper/devmapper_test.go → ...n/graphdriver/devmapper/devmapper_test.go b/...n/graphdriver/devmapper/devmapper_test.go → ...n/graphdriver/devmapper/devmapper_test.go