From b9a395c85de3f4ea10810c8df789fc67e5b4b604 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 3 Feb 2016 12:56:01 -0800 Subject: [PATCH] Remove case sensitive duplicate dir in vendor Signed-off-by: Tonis Tiigi --- daemon/execdriver/windows/exec.go | 2 +- daemon/execdriver/windows/run.go | 2 +- daemon/execdriver/windows/terminatekill.go | 2 +- daemon/execdriver/windows/ttyconsole.go | 2 +- daemon/graphdriver/windows/windows.go | 2 +- hack/vendor.sh | 2 +- vendor/src/github.com/{microsoft => Microsoft}/hcsshim/LICENSE | 0 .../{microsoft => Microsoft}/hcsshim/activatelayer.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/copylayer.go | 0 .../{microsoft => Microsoft}/hcsshim/createcomputesystem.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/createlayer.go | 0 .../{microsoft => Microsoft}/hcsshim/createprocess.go | 0 .../{microsoft => Microsoft}/hcsshim/createsandboxlayer.go | 0 .../{microsoft => Microsoft}/hcsshim/deactivatelayer.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/destroylayer.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/exportlayer.go | 0 .../{microsoft => Microsoft}/hcsshim/getlayermountpath.go | 0 .../{microsoft => Microsoft}/hcsshim/getsharedbaseimages.go | 0 vendor/src/github.com/{microsoft => Microsoft}/hcsshim/guid.go | 0 .../src/github.com/{microsoft => Microsoft}/hcsshim/hcsshim.go | 0 .../src/github.com/{microsoft => Microsoft}/hcsshim/hnsfuncs.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/importlayer.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/layerexists.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/layerutils.go | 0 .../{microsoft => Microsoft}/hcsshim/mksyscall_windows.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/nametoguid.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/preparelayer.go | 0 .../{microsoft => Microsoft}/hcsshim/resizeconsole.go | 0 .../hcsshim/shutdownterminatecomputesystem.go | 0 .../{microsoft => Microsoft}/hcsshim/startcomputesystem.go | 0 .../{microsoft => Microsoft}/hcsshim/terminateprocess.go | 0 .../{microsoft => Microsoft}/hcsshim/unpreparelayer.go | 0 .../github.com/{microsoft => Microsoft}/hcsshim/waitprocess.go | 0 .../src/github.com/{microsoft => Microsoft}/hcsshim/zhcsshim.go | 0 34 files changed, 6 insertions(+), 6 deletions(-) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/LICENSE (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/activatelayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/copylayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/createcomputesystem.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/createlayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/createprocess.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/createsandboxlayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/deactivatelayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/destroylayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/exportlayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/getlayermountpath.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/getsharedbaseimages.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/guid.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/hcsshim.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/hnsfuncs.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/importlayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/layerexists.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/layerutils.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/mksyscall_windows.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/nametoguid.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/preparelayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/resizeconsole.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/shutdownterminatecomputesystem.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/startcomputesystem.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/terminateprocess.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/unpreparelayer.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/waitprocess.go (100%) rename vendor/src/github.com/{microsoft => Microsoft}/hcsshim/zhcsshim.go (100%) diff --git a/daemon/execdriver/windows/exec.go b/daemon/execdriver/windows/exec.go index 791a84d5d1..1b6c06bd14 100644 --- a/daemon/execdriver/windows/exec.go +++ b/daemon/execdriver/windows/exec.go @@ -5,9 +5,9 @@ package windows import ( "fmt" + "github.com/Microsoft/hcsshim" "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/execdriver" - "github.com/microsoft/hcsshim" ) // Exec implements the exec driver Driver interface. diff --git a/daemon/execdriver/windows/run.go b/daemon/execdriver/windows/run.go index 195f6e6acd..0837ba85ee 100644 --- a/daemon/execdriver/windows/run.go +++ b/daemon/execdriver/windows/run.go @@ -11,9 +11,9 @@ import ( "strings" "time" + "github.com/Microsoft/hcsshim" "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/execdriver" - "github.com/microsoft/hcsshim" ) // defaultContainerNAT is the default name of the container NAT device that is diff --git a/daemon/execdriver/windows/terminatekill.go b/daemon/execdriver/windows/terminatekill.go index fe64ac5d17..7068a68fa9 100644 --- a/daemon/execdriver/windows/terminatekill.go +++ b/daemon/execdriver/windows/terminatekill.go @@ -6,9 +6,9 @@ import ( "fmt" "syscall" + "github.com/Microsoft/hcsshim" "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/execdriver" - "github.com/microsoft/hcsshim" ) // Terminate implements the exec driver Driver interface. diff --git a/daemon/execdriver/windows/ttyconsole.go b/daemon/execdriver/windows/ttyconsole.go index ca6b1ca273..78642f742a 100644 --- a/daemon/execdriver/windows/ttyconsole.go +++ b/daemon/execdriver/windows/ttyconsole.go @@ -3,7 +3,7 @@ package windows import ( - "github.com/microsoft/hcsshim" + "github.com/Microsoft/hcsshim" ) // TtyConsole implements the exec driver Terminal interface. diff --git a/daemon/graphdriver/windows/windows.go b/daemon/graphdriver/windows/windows.go index 0594225268..7465dc392a 100644 --- a/daemon/graphdriver/windows/windows.go +++ b/daemon/graphdriver/windows/windows.go @@ -15,6 +15,7 @@ import ( "sync" "time" + "github.com/Microsoft/hcsshim" "github.com/Sirupsen/logrus" "github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/pkg/archive" @@ -22,7 +23,6 @@ import ( "github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/random" - "github.com/microsoft/hcsshim" ) // init registers the windows graph drivers to the register. diff --git a/hack/vendor.sh b/hack/vendor.sh index dae1fa837e..bec81516b4 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -16,7 +16,7 @@ clone git github.com/gorilla/mux e444e69cbd clone git github.com/kr/pty 5cf931ef8f clone git github.com/mattn/go-shellwords v1.0.0 clone git github.com/mattn/go-sqlite3 v1.1.0 -clone git github.com/microsoft/hcsshim 35ad4d808a97203cb1748d7c43167e91f51e7f86 +clone git github.com/Microsoft/hcsshim 35ad4d808a97203cb1748d7c43167e91f51e7f86 clone git github.com/mistifyio/go-zfs v2.1.1 clone git github.com/tchap/go-patricia v2.1.0 clone git github.com/vdemeester/shakers 3c10293ce22b900c27acad7b28656196fcc2f73b diff --git a/vendor/src/github.com/microsoft/hcsshim/LICENSE b/vendor/src/github.com/Microsoft/hcsshim/LICENSE similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/LICENSE rename to vendor/src/github.com/Microsoft/hcsshim/LICENSE diff --git a/vendor/src/github.com/microsoft/hcsshim/activatelayer.go b/vendor/src/github.com/Microsoft/hcsshim/activatelayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/activatelayer.go rename to vendor/src/github.com/Microsoft/hcsshim/activatelayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/copylayer.go b/vendor/src/github.com/Microsoft/hcsshim/copylayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/copylayer.go rename to vendor/src/github.com/Microsoft/hcsshim/copylayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/createcomputesystem.go b/vendor/src/github.com/Microsoft/hcsshim/createcomputesystem.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/createcomputesystem.go rename to vendor/src/github.com/Microsoft/hcsshim/createcomputesystem.go diff --git a/vendor/src/github.com/microsoft/hcsshim/createlayer.go b/vendor/src/github.com/Microsoft/hcsshim/createlayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/createlayer.go rename to vendor/src/github.com/Microsoft/hcsshim/createlayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/createprocess.go b/vendor/src/github.com/Microsoft/hcsshim/createprocess.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/createprocess.go rename to vendor/src/github.com/Microsoft/hcsshim/createprocess.go diff --git a/vendor/src/github.com/microsoft/hcsshim/createsandboxlayer.go b/vendor/src/github.com/Microsoft/hcsshim/createsandboxlayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/createsandboxlayer.go rename to vendor/src/github.com/Microsoft/hcsshim/createsandboxlayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/deactivatelayer.go b/vendor/src/github.com/Microsoft/hcsshim/deactivatelayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/deactivatelayer.go rename to vendor/src/github.com/Microsoft/hcsshim/deactivatelayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/destroylayer.go b/vendor/src/github.com/Microsoft/hcsshim/destroylayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/destroylayer.go rename to vendor/src/github.com/Microsoft/hcsshim/destroylayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/exportlayer.go b/vendor/src/github.com/Microsoft/hcsshim/exportlayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/exportlayer.go rename to vendor/src/github.com/Microsoft/hcsshim/exportlayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/getlayermountpath.go b/vendor/src/github.com/Microsoft/hcsshim/getlayermountpath.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/getlayermountpath.go rename to vendor/src/github.com/Microsoft/hcsshim/getlayermountpath.go diff --git a/vendor/src/github.com/microsoft/hcsshim/getsharedbaseimages.go b/vendor/src/github.com/Microsoft/hcsshim/getsharedbaseimages.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/getsharedbaseimages.go rename to vendor/src/github.com/Microsoft/hcsshim/getsharedbaseimages.go diff --git a/vendor/src/github.com/microsoft/hcsshim/guid.go b/vendor/src/github.com/Microsoft/hcsshim/guid.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/guid.go rename to vendor/src/github.com/Microsoft/hcsshim/guid.go diff --git a/vendor/src/github.com/microsoft/hcsshim/hcsshim.go b/vendor/src/github.com/Microsoft/hcsshim/hcsshim.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/hcsshim.go rename to vendor/src/github.com/Microsoft/hcsshim/hcsshim.go diff --git a/vendor/src/github.com/microsoft/hcsshim/hnsfuncs.go b/vendor/src/github.com/Microsoft/hcsshim/hnsfuncs.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/hnsfuncs.go rename to vendor/src/github.com/Microsoft/hcsshim/hnsfuncs.go diff --git a/vendor/src/github.com/microsoft/hcsshim/importlayer.go b/vendor/src/github.com/Microsoft/hcsshim/importlayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/importlayer.go rename to vendor/src/github.com/Microsoft/hcsshim/importlayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/layerexists.go b/vendor/src/github.com/Microsoft/hcsshim/layerexists.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/layerexists.go rename to vendor/src/github.com/Microsoft/hcsshim/layerexists.go diff --git a/vendor/src/github.com/microsoft/hcsshim/layerutils.go b/vendor/src/github.com/Microsoft/hcsshim/layerutils.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/layerutils.go rename to vendor/src/github.com/Microsoft/hcsshim/layerutils.go diff --git a/vendor/src/github.com/microsoft/hcsshim/mksyscall_windows.go b/vendor/src/github.com/Microsoft/hcsshim/mksyscall_windows.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/mksyscall_windows.go rename to vendor/src/github.com/Microsoft/hcsshim/mksyscall_windows.go diff --git a/vendor/src/github.com/microsoft/hcsshim/nametoguid.go b/vendor/src/github.com/Microsoft/hcsshim/nametoguid.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/nametoguid.go rename to vendor/src/github.com/Microsoft/hcsshim/nametoguid.go diff --git a/vendor/src/github.com/microsoft/hcsshim/preparelayer.go b/vendor/src/github.com/Microsoft/hcsshim/preparelayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/preparelayer.go rename to vendor/src/github.com/Microsoft/hcsshim/preparelayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/resizeconsole.go b/vendor/src/github.com/Microsoft/hcsshim/resizeconsole.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/resizeconsole.go rename to vendor/src/github.com/Microsoft/hcsshim/resizeconsole.go diff --git a/vendor/src/github.com/microsoft/hcsshim/shutdownterminatecomputesystem.go b/vendor/src/github.com/Microsoft/hcsshim/shutdownterminatecomputesystem.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/shutdownterminatecomputesystem.go rename to vendor/src/github.com/Microsoft/hcsshim/shutdownterminatecomputesystem.go diff --git a/vendor/src/github.com/microsoft/hcsshim/startcomputesystem.go b/vendor/src/github.com/Microsoft/hcsshim/startcomputesystem.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/startcomputesystem.go rename to vendor/src/github.com/Microsoft/hcsshim/startcomputesystem.go diff --git a/vendor/src/github.com/microsoft/hcsshim/terminateprocess.go b/vendor/src/github.com/Microsoft/hcsshim/terminateprocess.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/terminateprocess.go rename to vendor/src/github.com/Microsoft/hcsshim/terminateprocess.go diff --git a/vendor/src/github.com/microsoft/hcsshim/unpreparelayer.go b/vendor/src/github.com/Microsoft/hcsshim/unpreparelayer.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/unpreparelayer.go rename to vendor/src/github.com/Microsoft/hcsshim/unpreparelayer.go diff --git a/vendor/src/github.com/microsoft/hcsshim/waitprocess.go b/vendor/src/github.com/Microsoft/hcsshim/waitprocess.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/waitprocess.go rename to vendor/src/github.com/Microsoft/hcsshim/waitprocess.go diff --git a/vendor/src/github.com/microsoft/hcsshim/zhcsshim.go b/vendor/src/github.com/Microsoft/hcsshim/zhcsshim.go similarity index 100% rename from vendor/src/github.com/microsoft/hcsshim/zhcsshim.go rename to vendor/src/github.com/Microsoft/hcsshim/zhcsshim.go