From 4290bf9bb719852861e75b19cfa2a85445f0ddba Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Fri, 13 Jan 2017 15:48:04 -0500 Subject: [PATCH] Switch to GO15VENDOREXPERIMENT=1 vendoring Moved vendored packages from vendor/src to vendor, which should reduce conflicts with other packages when we're vendored. Signed-off-by: Nalin Dahyabhai --- hack/.vendor-helpers.sh | 19 ++++++++----------- hack/vendor.sh | 4 ++-- .../github.com/Microsoft/go-winio/.gitignore | 0 .../github.com/Microsoft/go-winio/LICENSE | 0 .../github.com/Microsoft/go-winio/README.md | 0 .../Microsoft/go-winio/archive/tar/LICENSE | 0 .../Microsoft/go-winio/archive/tar/common.go | 0 .../Microsoft/go-winio/archive/tar/reader.go | 0 .../go-winio/archive/tar/stat_atim.go | 0 .../go-winio/archive/tar/stat_atimespec.go | 0 .../go-winio/archive/tar/stat_unix.go | 0 .../Microsoft/go-winio/archive/tar/writer.go | 0 .../github.com/Microsoft/go-winio/backup.go | 0 .../Microsoft/go-winio/backuptar/tar.go | 0 .../github.com/Microsoft/go-winio/file.go | 0 .../github.com/Microsoft/go-winio/fileinfo.go | 0 .../github.com/Microsoft/go-winio/pipe.go | 0 .../Microsoft/go-winio/privilege.go | 0 .../github.com/Microsoft/go-winio/reparse.go | 0 .../github.com/Microsoft/go-winio/sd.go | 0 .../github.com/Microsoft/go-winio/syscall.go | 0 .../github.com/Microsoft/go-winio/zsyscall.go | 0 .../github.com/Microsoft/hcsshim/LICENSE | 0 .../github.com/Microsoft/hcsshim/README.md | 0 .../Microsoft/hcsshim/activatelayer.go | 0 .../github.com/Microsoft/hcsshim/baselayer.go | 0 .../github.com/Microsoft/hcsshim/callback.go | 0 .../github.com/Microsoft/hcsshim/container.go | 0 .../Microsoft/hcsshim/createcomputesystem.go | 0 .../Microsoft/hcsshim/createlayer.go | 0 .../Microsoft/hcsshim/createprocess.go | 0 .../Microsoft/hcsshim/createsandboxlayer.go | 0 .../Microsoft/hcsshim/deactivatelayer.go | 0 .../Microsoft/hcsshim/destroylayer.go | 0 .../github.com/Microsoft/hcsshim/errors.go | 0 .../Microsoft/hcsshim/expandsandboxsize.go | 0 .../Microsoft/hcsshim/exportlayer.go | 0 .../hcsshim/getcomputesystemproperties.go | 0 .../Microsoft/hcsshim/getlayermountpath.go | 0 .../Microsoft/hcsshim/getsharedbaseimages.go | 0 .../github.com/Microsoft/hcsshim/guid.go | 0 .../github.com/Microsoft/hcsshim/hcsshim.go | 0 .../github.com/Microsoft/hcsshim/hnsfuncs.go | 0 .../Microsoft/hcsshim/importlayer.go | 0 .../github.com/Microsoft/hcsshim/interface.go | 0 .../Microsoft/hcsshim/layerexists.go | 0 .../Microsoft/hcsshim/layerutils.go | 0 .../github.com/Microsoft/hcsshim/legacy.go | 0 .../Microsoft/hcsshim/mksyscall_windows.go | 0 .../Microsoft/hcsshim/nametoguid.go | 0 .../Microsoft/hcsshim/preparelayer.go | 0 .../github.com/Microsoft/hcsshim/process.go | 0 .../Microsoft/hcsshim/processimage.go | 0 .../Microsoft/hcsshim/resizeconsole.go | 0 .../hcsshim/shutdownterminatecomputesystem.go | 0 .../Microsoft/hcsshim/startcomputesystem.go | 0 .../Microsoft/hcsshim/terminateprocess.go | 0 .../Microsoft/hcsshim/unpreparelayer.go | 0 .../github.com/Microsoft/hcsshim/utils.go | 0 .../github.com/Microsoft/hcsshim/version.go | 0 .../Microsoft/hcsshim/waithelper.go | 0 .../Microsoft/hcsshim/waitprocess.go | 0 .../github.com/Microsoft/hcsshim/zhcsshim.go | 0 .../github.com/Sirupsen/logrus/.gitignore | 0 .../github.com/Sirupsen/logrus/.travis.yml | 0 .../github.com/Sirupsen/logrus/CHANGELOG.md | 0 .../github.com/Sirupsen/logrus/LICENSE | 0 .../github.com/Sirupsen/logrus/README.md | 0 .../github.com/Sirupsen/logrus/doc.go | 0 .../github.com/Sirupsen/logrus/entry.go | 0 .../github.com/Sirupsen/logrus/exported.go | 0 .../github.com/Sirupsen/logrus/formatter.go | 0 .../github.com/Sirupsen/logrus/hooks.go | 0 .../Sirupsen/logrus/json_formatter.go | 0 .../github.com/Sirupsen/logrus/logger.go | 0 .../github.com/Sirupsen/logrus/logrus.go | 0 .../Sirupsen/logrus/terminal_bsd.go | 0 .../Sirupsen/logrus/terminal_linux.go | 0 .../Sirupsen/logrus/terminal_notwindows.go | 0 .../Sirupsen/logrus/terminal_solaris.go | 0 .../Sirupsen/logrus/terminal_windows.go | 0 .../Sirupsen/logrus/text_formatter.go | 0 .../github.com/Sirupsen/logrus/writer.go | 0 .../github.com/docker/engine-api/LICENSE | 0 .../client/transport/cancellable/LICENSE | 0 .../docker/engine-api/types/filters/parse.go | 0 .../engine-api/types/versions/README.md | 0 .../engine-api/types/versions/compare.go | 0 .../github.com/docker/go-connections/LICENSE | 0 .../docker/go-connections/sockets/README.md | 0 .../go-connections/sockets/inmem_socket.go | 0 .../docker/go-connections/sockets/proxy.go | 0 .../docker/go-connections/sockets/sockets.go | 0 .../go-connections/sockets/sockets_unix.go | 0 .../go-connections/sockets/sockets_windows.go | 0 .../go-connections/sockets/tcp_socket.go | 0 .../go-connections/sockets/unix_socket.go | 0 .../docker/go-connections/tlsconfig/config.go | 0 .../tlsconfig/config_client_ciphers.go | 0 .../tlsconfig/config_legacy_client_ciphers.go | 0 .../github.com/docker/go-units/LICENSE | 0 .../github.com/docker/go-units/README.md | 0 .../github.com/docker/go-units/circle.yml | 0 .../github.com/docker/go-units/duration.go | 0 .../github.com/docker/go-units/size.go | 0 .../github.com/docker/go-units/ulimit.go | 0 .../github.com/mistifyio/go-zfs/.gitignore | 0 .../github.com/mistifyio/go-zfs/.travis.yml | 0 .../mistifyio/go-zfs/CONTRIBUTING.md | 0 .../github.com/mistifyio/go-zfs/LICENSE | 0 .../github.com/mistifyio/go-zfs/README.md | 0 .../github.com/mistifyio/go-zfs/error.go | 0 .../github.com/mistifyio/go-zfs/utils.go | 0 .../mistifyio/go-zfs/utils_notsolaris.go | 0 .../mistifyio/go-zfs/utils_solaris.go | 0 .../github.com/mistifyio/go-zfs/zfs.go | 0 .../github.com/mistifyio/go-zfs/zpool.go | 0 .../github.com/opencontainers/runc/LICENSE | 0 .../runc/libcontainer/label/label.go | 0 .../runc/libcontainer/label/label_selinux.go | 0 .../runc/libcontainer/system/linux.go | 0 .../runc/libcontainer/system/proc.go | 0 .../runc/libcontainer/system/setns_linux.go | 0 .../libcontainer/system/syscall_linux_386.go | 0 .../libcontainer/system/syscall_linux_64.go | 0 .../libcontainer/system/syscall_linux_arm.go | 0 .../runc/libcontainer/system/sysconfig.go | 0 .../libcontainer/system/sysconfig_notcgo.go | 0 .../runc/libcontainer/system/unsupported.go | 0 .../runc/libcontainer/system/xattrs_linux.go | 0 .../runc/libcontainer/user/MAINTAINERS | 0 .../runc/libcontainer/user/lookup.go | 0 .../runc/libcontainer/user/lookup_unix.go | 0 .../libcontainer/user/lookup_unsupported.go | 0 .../runc/libcontainer/user/user.go | 0 .../github.com/pborman/uuid/.travis.yml | 0 .../github.com/pborman/uuid/CONTRIBUTORS | 0 .../{src => }/github.com/pborman/uuid/LICENSE | 0 .../github.com/pborman/uuid/README.md | 0 .../{src => }/github.com/pborman/uuid/dce.go | 0 .../{src => }/github.com/pborman/uuid/doc.go | 0 .../{src => }/github.com/pborman/uuid/hash.go | 0 .../{src => }/github.com/pborman/uuid/json.go | 0 .../{src => }/github.com/pborman/uuid/node.go | 0 .../{src => }/github.com/pborman/uuid/sql.go | 0 .../{src => }/github.com/pborman/uuid/time.go | 0 .../{src => }/github.com/pborman/uuid/util.go | 0 .../{src => }/github.com/pborman/uuid/uuid.go | 0 .../github.com/pborman/uuid/version1.go | 0 .../github.com/pborman/uuid/version4.go | 0 .../github.com/vbatts/tar-split/LICENSE | 0 .../vbatts/tar-split/archive/tar/common.go | 0 .../vbatts/tar-split/archive/tar/reader.go | 0 .../vbatts/tar-split/archive/tar/stat_atim.go | 0 .../tar-split/archive/tar/stat_atimespec.go | 0 .../vbatts/tar-split/archive/tar/stat_unix.go | 0 .../vbatts/tar-split/archive/tar/writer.go | 0 .../vbatts/tar-split/tar/asm/README.md | 0 .../vbatts/tar-split/tar/asm/assemble.go | 0 .../vbatts/tar-split/tar/asm/disassemble.go | 0 .../vbatts/tar-split/tar/asm/doc.go | 0 .../vbatts/tar-split/tar/storage/doc.go | 0 .../vbatts/tar-split/tar/storage/entry.go | 0 .../vbatts/tar-split/tar/storage/getter.go | 0 .../vbatts/tar-split/tar/storage/packer.go | 0 vendor/{src => }/golang.org/x/net/LICENSE | 0 .../golang.org/x/net/context/context.go | 0 .../golang.org/x/net/proxy/direct.go | 0 .../golang.org/x/net/proxy/per_host.go | 0 .../{src => }/golang.org/x/net/proxy/proxy.go | 0 .../golang.org/x/net/proxy/socks5.go | 0 vendor/{src => }/golang.org/x/sys/LICENSE | 0 .../{src => }/golang.org/x/sys/windows/asm.s | 0 .../x/sys/windows/asm_windows_386.s | 0 .../x/sys/windows/asm_windows_amd64.s | 0 .../golang.org/x/sys/windows/dll_windows.go | 0 .../golang.org/x/sys/windows/env_unset.go | 0 .../golang.org/x/sys/windows/env_windows.go | 0 .../golang.org/x/sys/windows/eventlog.go | 0 .../golang.org/x/sys/windows/exec_windows.go | 0 .../golang.org/x/sys/windows/race.go | 0 .../golang.org/x/sys/windows/race0.go | 0 .../x/sys/windows/security_windows.go | 0 .../golang.org/x/sys/windows/service.go | 0 .../{src => }/golang.org/x/sys/windows/str.go | 0 .../golang.org/x/sys/windows/syscall.go | 0 .../x/sys/windows/syscall_windows.go | 0 .../x/sys/windows/zsyscall_windows.go | 0 .../x/sys/windows/ztypes_windows.go | 0 .../x/sys/windows/ztypes_windows_386.go | 0 .../x/sys/windows/ztypes_windows_amd64.go | 0 191 files changed, 10 insertions(+), 13 deletions(-) rename vendor/{src => }/github.com/Microsoft/go-winio/.gitignore (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/LICENSE (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/README.md (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/archive/tar/LICENSE (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/archive/tar/common.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/archive/tar/reader.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/archive/tar/stat_atim.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/archive/tar/stat_unix.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/archive/tar/writer.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/backup.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/backuptar/tar.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/file.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/fileinfo.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/pipe.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/privilege.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/reparse.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/sd.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/syscall.go (100%) rename vendor/{src => }/github.com/Microsoft/go-winio/zsyscall.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/LICENSE (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/README.md (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/activatelayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/baselayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/callback.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/container.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/createcomputesystem.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/createlayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/createprocess.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/createsandboxlayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/deactivatelayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/destroylayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/errors.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/expandsandboxsize.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/exportlayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/getcomputesystemproperties.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/getlayermountpath.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/getsharedbaseimages.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/guid.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/hcsshim.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/hnsfuncs.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/importlayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/interface.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/layerexists.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/layerutils.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/legacy.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/mksyscall_windows.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/nametoguid.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/preparelayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/process.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/processimage.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/resizeconsole.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/shutdownterminatecomputesystem.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/startcomputesystem.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/terminateprocess.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/unpreparelayer.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/utils.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/version.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/waithelper.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/waitprocess.go (100%) rename vendor/{src => }/github.com/Microsoft/hcsshim/zhcsshim.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/.gitignore (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/.travis.yml (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/CHANGELOG.md (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/LICENSE (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/README.md (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/doc.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/entry.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/exported.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/formatter.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/hooks.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/json_formatter.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/logger.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/logrus.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/terminal_bsd.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/terminal_linux.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/terminal_notwindows.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/terminal_solaris.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/terminal_windows.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/text_formatter.go (100%) rename vendor/{src => }/github.com/Sirupsen/logrus/writer.go (100%) rename vendor/{src => }/github.com/docker/engine-api/LICENSE (100%) rename vendor/{src => }/github.com/docker/engine-api/client/transport/cancellable/LICENSE (100%) rename vendor/{src => }/github.com/docker/engine-api/types/filters/parse.go (100%) rename vendor/{src => }/github.com/docker/engine-api/types/versions/README.md (100%) rename vendor/{src => }/github.com/docker/engine-api/types/versions/compare.go (100%) rename vendor/{src => }/github.com/docker/go-connections/LICENSE (100%) rename vendor/{src => }/github.com/docker/go-connections/sockets/README.md (100%) rename vendor/{src => }/github.com/docker/go-connections/sockets/inmem_socket.go (100%) rename vendor/{src => }/github.com/docker/go-connections/sockets/proxy.go (100%) rename vendor/{src => }/github.com/docker/go-connections/sockets/sockets.go (100%) rename vendor/{src => }/github.com/docker/go-connections/sockets/sockets_unix.go (100%) rename vendor/{src => }/github.com/docker/go-connections/sockets/sockets_windows.go (100%) rename vendor/{src => }/github.com/docker/go-connections/sockets/tcp_socket.go (100%) rename vendor/{src => }/github.com/docker/go-connections/sockets/unix_socket.go (100%) rename vendor/{src => }/github.com/docker/go-connections/tlsconfig/config.go (100%) rename vendor/{src => }/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go (100%) rename vendor/{src => }/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go (100%) rename vendor/{src => }/github.com/docker/go-units/LICENSE (100%) rename vendor/{src => }/github.com/docker/go-units/README.md (100%) rename vendor/{src => }/github.com/docker/go-units/circle.yml (100%) rename vendor/{src => }/github.com/docker/go-units/duration.go (100%) rename vendor/{src => }/github.com/docker/go-units/size.go (100%) rename vendor/{src => }/github.com/docker/go-units/ulimit.go (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/.gitignore (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/.travis.yml (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/CONTRIBUTING.md (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/LICENSE (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/README.md (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/error.go (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/utils.go (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/utils_notsolaris.go (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/utils_solaris.go (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/zfs.go (100%) rename vendor/{src => }/github.com/mistifyio/go-zfs/zpool.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/LICENSE (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/label/label.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/label/label_selinux.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/linux.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/proc.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/setns_linux.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/sysconfig.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/unsupported.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/user/lookup.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go (100%) rename vendor/{src => }/github.com/opencontainers/runc/libcontainer/user/user.go (100%) rename vendor/{src => }/github.com/pborman/uuid/.travis.yml (100%) rename vendor/{src => }/github.com/pborman/uuid/CONTRIBUTORS (100%) rename vendor/{src => }/github.com/pborman/uuid/LICENSE (100%) rename vendor/{src => }/github.com/pborman/uuid/README.md (100%) rename vendor/{src => }/github.com/pborman/uuid/dce.go (100%) rename vendor/{src => }/github.com/pborman/uuid/doc.go (100%) rename vendor/{src => }/github.com/pborman/uuid/hash.go (100%) rename vendor/{src => }/github.com/pborman/uuid/json.go (100%) rename vendor/{src => }/github.com/pborman/uuid/node.go (100%) rename vendor/{src => }/github.com/pborman/uuid/sql.go (100%) rename vendor/{src => }/github.com/pborman/uuid/time.go (100%) rename vendor/{src => }/github.com/pborman/uuid/util.go (100%) rename vendor/{src => }/github.com/pborman/uuid/uuid.go (100%) rename vendor/{src => }/github.com/pborman/uuid/version1.go (100%) rename vendor/{src => }/github.com/pborman/uuid/version4.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/LICENSE (100%) rename vendor/{src => }/github.com/vbatts/tar-split/archive/tar/common.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/archive/tar/reader.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/archive/tar/stat_atim.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/archive/tar/stat_unix.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/archive/tar/writer.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/tar/asm/README.md (100%) rename vendor/{src => }/github.com/vbatts/tar-split/tar/asm/assemble.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/tar/asm/disassemble.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/tar/asm/doc.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/tar/storage/doc.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/tar/storage/entry.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/tar/storage/getter.go (100%) rename vendor/{src => }/github.com/vbatts/tar-split/tar/storage/packer.go (100%) rename vendor/{src => }/golang.org/x/net/LICENSE (100%) rename vendor/{src => }/golang.org/x/net/context/context.go (100%) rename vendor/{src => }/golang.org/x/net/proxy/direct.go (100%) rename vendor/{src => }/golang.org/x/net/proxy/per_host.go (100%) rename vendor/{src => }/golang.org/x/net/proxy/proxy.go (100%) rename vendor/{src => }/golang.org/x/net/proxy/socks5.go (100%) rename vendor/{src => }/golang.org/x/sys/LICENSE (100%) rename vendor/{src => }/golang.org/x/sys/windows/asm.s (100%) rename vendor/{src => }/golang.org/x/sys/windows/asm_windows_386.s (100%) rename vendor/{src => }/golang.org/x/sys/windows/asm_windows_amd64.s (100%) rename vendor/{src => }/golang.org/x/sys/windows/dll_windows.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/env_unset.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/env_windows.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/eventlog.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/exec_windows.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/race.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/race0.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/security_windows.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/service.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/str.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/syscall.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/syscall_windows.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/zsyscall_windows.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/ztypes_windows.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/ztypes_windows_386.go (100%) rename vendor/{src => }/golang.org/x/sys/windows/ztypes_windows_amd64.go (100%) diff --git a/hack/.vendor-helpers.sh b/hack/.vendor-helpers.sh index 07f0ba6cb4..0b402e6168 100755 --- a/hack/.vendor-helpers.sh +++ b/hack/.vendor-helpers.sh @@ -5,13 +5,10 @@ PROJECT=github.com/containers/storage # Downloads dependencies into vendor/ directory mkdir -p vendor -if ! go list github.com/containers/storage/storage &> /dev/null; then - rm -rf .gopath - mkdir -p .gopath/src/github.com/containers - ln -sf ../../../.. .gopath/src/${PROJECT} - export GOPATH="${PWD}/.gopath:${PWD}/vendor" -fi -export GOPATH="$GOPATH:${PWD}/vendor" +rm -rf .gopath +mkdir -p .gopath/src/github.com/containers +ln -sf ../../../.. .gopath/src/${PROJECT} +export GOPATH="${PWD}/.gopath" find='find' if [ "$(go env GOHOSTOS)" = 'windows' ]; then @@ -25,7 +22,7 @@ clone() { local url="$4" : ${url:=https://$pkg} - local target="vendor/src/$pkg" + local target="vendor/$pkg" echo -n "$pkg @ $rev: " @@ -77,7 +74,7 @@ clean() { go list -e -tags "$buildTags" -f '{{join .Deps "\n"}}' "${packages[@]}" go list -e -tags "$buildTags" -f '{{join .TestImports "\n"}}' "${packages[@]}" done - done | grep -vE "^${PROJECT}/" | sort -u + done | grep -E "^${PROJECT}/vendor/" | sed -e "s:${PROJECT}/vendor/::g" | sort -u ) ) imports=( $(go list -e -f '{{if not .Standard}}{{.ImportPath}}{{end}}' "${imports[@]}") ) unset IFS @@ -87,7 +84,7 @@ clean() { for import in "${imports[@]}"; do [ "${#findArgs[@]}" -eq 0 ] || findArgs+=( -or ) - findArgs+=( -path "vendor/src/$import" ) + findArgs+=( -path "vendor/$import" ) done local IFS=$'\n' @@ -113,7 +110,7 @@ clean() { fix_rewritten_imports () { local pkg="$1" local remove="${pkg}/Godeps/_workspace/src/" - local target="vendor/src/$pkg" + local target="vendor/$pkg" echo "$pkg: fixing rewritten imports" $find "$target" -name \*.go -exec sed -i'.orig' -e "s|\"${remove}|\"|g" {} \; diff --git a/hack/vendor.sh b/hack/vendor.sh index c0c7278ffc..392c2b28cc 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -24,13 +24,13 @@ case $# in exit 0 ;; 2) - rm -rf "vendor/src/$1" + rm -rf "vendor/$1" clone git "$1" "$2" clean exit 0 ;; [34]) - rm -rf "vendor/src/$2" + rm -rf "vendor/$2" clone "$@" clean exit 0 diff --git a/vendor/src/github.com/Microsoft/go-winio/.gitignore b/vendor/github.com/Microsoft/go-winio/.gitignore similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/.gitignore rename to vendor/github.com/Microsoft/go-winio/.gitignore diff --git a/vendor/src/github.com/Microsoft/go-winio/LICENSE b/vendor/github.com/Microsoft/go-winio/LICENSE similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/LICENSE rename to vendor/github.com/Microsoft/go-winio/LICENSE diff --git a/vendor/src/github.com/Microsoft/go-winio/README.md b/vendor/github.com/Microsoft/go-winio/README.md similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/README.md rename to vendor/github.com/Microsoft/go-winio/README.md diff --git a/vendor/src/github.com/Microsoft/go-winio/archive/tar/LICENSE b/vendor/github.com/Microsoft/go-winio/archive/tar/LICENSE similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/archive/tar/LICENSE rename to vendor/github.com/Microsoft/go-winio/archive/tar/LICENSE diff --git a/vendor/src/github.com/Microsoft/go-winio/archive/tar/common.go b/vendor/github.com/Microsoft/go-winio/archive/tar/common.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/archive/tar/common.go rename to vendor/github.com/Microsoft/go-winio/archive/tar/common.go diff --git a/vendor/src/github.com/Microsoft/go-winio/archive/tar/reader.go b/vendor/github.com/Microsoft/go-winio/archive/tar/reader.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/archive/tar/reader.go rename to vendor/github.com/Microsoft/go-winio/archive/tar/reader.go diff --git a/vendor/src/github.com/Microsoft/go-winio/archive/tar/stat_atim.go b/vendor/github.com/Microsoft/go-winio/archive/tar/stat_atim.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/archive/tar/stat_atim.go rename to vendor/github.com/Microsoft/go-winio/archive/tar/stat_atim.go diff --git a/vendor/src/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go b/vendor/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go rename to vendor/github.com/Microsoft/go-winio/archive/tar/stat_atimespec.go diff --git a/vendor/src/github.com/Microsoft/go-winio/archive/tar/stat_unix.go b/vendor/github.com/Microsoft/go-winio/archive/tar/stat_unix.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/archive/tar/stat_unix.go rename to vendor/github.com/Microsoft/go-winio/archive/tar/stat_unix.go diff --git a/vendor/src/github.com/Microsoft/go-winio/archive/tar/writer.go b/vendor/github.com/Microsoft/go-winio/archive/tar/writer.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/archive/tar/writer.go rename to vendor/github.com/Microsoft/go-winio/archive/tar/writer.go diff --git a/vendor/src/github.com/Microsoft/go-winio/backup.go b/vendor/github.com/Microsoft/go-winio/backup.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/backup.go rename to vendor/github.com/Microsoft/go-winio/backup.go diff --git a/vendor/src/github.com/Microsoft/go-winio/backuptar/tar.go b/vendor/github.com/Microsoft/go-winio/backuptar/tar.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/backuptar/tar.go rename to vendor/github.com/Microsoft/go-winio/backuptar/tar.go diff --git a/vendor/src/github.com/Microsoft/go-winio/file.go b/vendor/github.com/Microsoft/go-winio/file.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/file.go rename to vendor/github.com/Microsoft/go-winio/file.go diff --git a/vendor/src/github.com/Microsoft/go-winio/fileinfo.go b/vendor/github.com/Microsoft/go-winio/fileinfo.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/fileinfo.go rename to vendor/github.com/Microsoft/go-winio/fileinfo.go diff --git a/vendor/src/github.com/Microsoft/go-winio/pipe.go b/vendor/github.com/Microsoft/go-winio/pipe.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/pipe.go rename to vendor/github.com/Microsoft/go-winio/pipe.go diff --git a/vendor/src/github.com/Microsoft/go-winio/privilege.go b/vendor/github.com/Microsoft/go-winio/privilege.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/privilege.go rename to vendor/github.com/Microsoft/go-winio/privilege.go diff --git a/vendor/src/github.com/Microsoft/go-winio/reparse.go b/vendor/github.com/Microsoft/go-winio/reparse.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/reparse.go rename to vendor/github.com/Microsoft/go-winio/reparse.go diff --git a/vendor/src/github.com/Microsoft/go-winio/sd.go b/vendor/github.com/Microsoft/go-winio/sd.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/sd.go rename to vendor/github.com/Microsoft/go-winio/sd.go diff --git a/vendor/src/github.com/Microsoft/go-winio/syscall.go b/vendor/github.com/Microsoft/go-winio/syscall.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/syscall.go rename to vendor/github.com/Microsoft/go-winio/syscall.go diff --git a/vendor/src/github.com/Microsoft/go-winio/zsyscall.go b/vendor/github.com/Microsoft/go-winio/zsyscall.go similarity index 100% rename from vendor/src/github.com/Microsoft/go-winio/zsyscall.go rename to vendor/github.com/Microsoft/go-winio/zsyscall.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/LICENSE b/vendor/github.com/Microsoft/hcsshim/LICENSE similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/LICENSE rename to vendor/github.com/Microsoft/hcsshim/LICENSE diff --git a/vendor/src/github.com/Microsoft/hcsshim/README.md b/vendor/github.com/Microsoft/hcsshim/README.md similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/README.md rename to vendor/github.com/Microsoft/hcsshim/README.md diff --git a/vendor/src/github.com/Microsoft/hcsshim/activatelayer.go b/vendor/github.com/Microsoft/hcsshim/activatelayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/activatelayer.go rename to vendor/github.com/Microsoft/hcsshim/activatelayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/baselayer.go b/vendor/github.com/Microsoft/hcsshim/baselayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/baselayer.go rename to vendor/github.com/Microsoft/hcsshim/baselayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/callback.go b/vendor/github.com/Microsoft/hcsshim/callback.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/callback.go rename to vendor/github.com/Microsoft/hcsshim/callback.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/container.go b/vendor/github.com/Microsoft/hcsshim/container.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/container.go rename to vendor/github.com/Microsoft/hcsshim/container.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/createcomputesystem.go b/vendor/github.com/Microsoft/hcsshim/createcomputesystem.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/createcomputesystem.go rename to vendor/github.com/Microsoft/hcsshim/createcomputesystem.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/createlayer.go b/vendor/github.com/Microsoft/hcsshim/createlayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/createlayer.go rename to vendor/github.com/Microsoft/hcsshim/createlayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/createprocess.go b/vendor/github.com/Microsoft/hcsshim/createprocess.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/createprocess.go rename to vendor/github.com/Microsoft/hcsshim/createprocess.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/createsandboxlayer.go b/vendor/github.com/Microsoft/hcsshim/createsandboxlayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/createsandboxlayer.go rename to vendor/github.com/Microsoft/hcsshim/createsandboxlayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/deactivatelayer.go b/vendor/github.com/Microsoft/hcsshim/deactivatelayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/deactivatelayer.go rename to vendor/github.com/Microsoft/hcsshim/deactivatelayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/destroylayer.go b/vendor/github.com/Microsoft/hcsshim/destroylayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/destroylayer.go rename to vendor/github.com/Microsoft/hcsshim/destroylayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/errors.go b/vendor/github.com/Microsoft/hcsshim/errors.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/errors.go rename to vendor/github.com/Microsoft/hcsshim/errors.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/expandsandboxsize.go b/vendor/github.com/Microsoft/hcsshim/expandsandboxsize.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/expandsandboxsize.go rename to vendor/github.com/Microsoft/hcsshim/expandsandboxsize.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/exportlayer.go b/vendor/github.com/Microsoft/hcsshim/exportlayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/exportlayer.go rename to vendor/github.com/Microsoft/hcsshim/exportlayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/getcomputesystemproperties.go b/vendor/github.com/Microsoft/hcsshim/getcomputesystemproperties.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/getcomputesystemproperties.go rename to vendor/github.com/Microsoft/hcsshim/getcomputesystemproperties.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/getlayermountpath.go b/vendor/github.com/Microsoft/hcsshim/getlayermountpath.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/getlayermountpath.go rename to vendor/github.com/Microsoft/hcsshim/getlayermountpath.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/getsharedbaseimages.go b/vendor/github.com/Microsoft/hcsshim/getsharedbaseimages.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/getsharedbaseimages.go rename to vendor/github.com/Microsoft/hcsshim/getsharedbaseimages.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/guid.go b/vendor/github.com/Microsoft/hcsshim/guid.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/guid.go rename to vendor/github.com/Microsoft/hcsshim/guid.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/hcsshim.go b/vendor/github.com/Microsoft/hcsshim/hcsshim.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/hcsshim.go rename to vendor/github.com/Microsoft/hcsshim/hcsshim.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/hnsfuncs.go b/vendor/github.com/Microsoft/hcsshim/hnsfuncs.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/hnsfuncs.go rename to vendor/github.com/Microsoft/hcsshim/hnsfuncs.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/importlayer.go b/vendor/github.com/Microsoft/hcsshim/importlayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/importlayer.go rename to vendor/github.com/Microsoft/hcsshim/importlayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/interface.go b/vendor/github.com/Microsoft/hcsshim/interface.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/interface.go rename to vendor/github.com/Microsoft/hcsshim/interface.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/layerexists.go b/vendor/github.com/Microsoft/hcsshim/layerexists.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/layerexists.go rename to vendor/github.com/Microsoft/hcsshim/layerexists.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/layerutils.go b/vendor/github.com/Microsoft/hcsshim/layerutils.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/layerutils.go rename to vendor/github.com/Microsoft/hcsshim/layerutils.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/legacy.go b/vendor/github.com/Microsoft/hcsshim/legacy.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/legacy.go rename to vendor/github.com/Microsoft/hcsshim/legacy.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/mksyscall_windows.go b/vendor/github.com/Microsoft/hcsshim/mksyscall_windows.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/mksyscall_windows.go rename to vendor/github.com/Microsoft/hcsshim/mksyscall_windows.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/nametoguid.go b/vendor/github.com/Microsoft/hcsshim/nametoguid.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/nametoguid.go rename to vendor/github.com/Microsoft/hcsshim/nametoguid.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/preparelayer.go b/vendor/github.com/Microsoft/hcsshim/preparelayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/preparelayer.go rename to vendor/github.com/Microsoft/hcsshim/preparelayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/process.go b/vendor/github.com/Microsoft/hcsshim/process.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/process.go rename to vendor/github.com/Microsoft/hcsshim/process.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/processimage.go b/vendor/github.com/Microsoft/hcsshim/processimage.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/processimage.go rename to vendor/github.com/Microsoft/hcsshim/processimage.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/resizeconsole.go b/vendor/github.com/Microsoft/hcsshim/resizeconsole.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/resizeconsole.go rename to vendor/github.com/Microsoft/hcsshim/resizeconsole.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/shutdownterminatecomputesystem.go b/vendor/github.com/Microsoft/hcsshim/shutdownterminatecomputesystem.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/shutdownterminatecomputesystem.go rename to vendor/github.com/Microsoft/hcsshim/shutdownterminatecomputesystem.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/startcomputesystem.go b/vendor/github.com/Microsoft/hcsshim/startcomputesystem.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/startcomputesystem.go rename to vendor/github.com/Microsoft/hcsshim/startcomputesystem.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/terminateprocess.go b/vendor/github.com/Microsoft/hcsshim/terminateprocess.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/terminateprocess.go rename to vendor/github.com/Microsoft/hcsshim/terminateprocess.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/unpreparelayer.go b/vendor/github.com/Microsoft/hcsshim/unpreparelayer.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/unpreparelayer.go rename to vendor/github.com/Microsoft/hcsshim/unpreparelayer.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/utils.go b/vendor/github.com/Microsoft/hcsshim/utils.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/utils.go rename to vendor/github.com/Microsoft/hcsshim/utils.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/version.go b/vendor/github.com/Microsoft/hcsshim/version.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/version.go rename to vendor/github.com/Microsoft/hcsshim/version.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/waithelper.go b/vendor/github.com/Microsoft/hcsshim/waithelper.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/waithelper.go rename to vendor/github.com/Microsoft/hcsshim/waithelper.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/waitprocess.go b/vendor/github.com/Microsoft/hcsshim/waitprocess.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/waitprocess.go rename to vendor/github.com/Microsoft/hcsshim/waitprocess.go diff --git a/vendor/src/github.com/Microsoft/hcsshim/zhcsshim.go b/vendor/github.com/Microsoft/hcsshim/zhcsshim.go similarity index 100% rename from vendor/src/github.com/Microsoft/hcsshim/zhcsshim.go rename to vendor/github.com/Microsoft/hcsshim/zhcsshim.go diff --git a/vendor/src/github.com/Sirupsen/logrus/.gitignore b/vendor/github.com/Sirupsen/logrus/.gitignore similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/.gitignore rename to vendor/github.com/Sirupsen/logrus/.gitignore diff --git a/vendor/src/github.com/Sirupsen/logrus/.travis.yml b/vendor/github.com/Sirupsen/logrus/.travis.yml similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/.travis.yml rename to vendor/github.com/Sirupsen/logrus/.travis.yml diff --git a/vendor/src/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/Sirupsen/logrus/CHANGELOG.md similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/CHANGELOG.md rename to vendor/github.com/Sirupsen/logrus/CHANGELOG.md diff --git a/vendor/src/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/Sirupsen/logrus/LICENSE similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/LICENSE rename to vendor/github.com/Sirupsen/logrus/LICENSE diff --git a/vendor/src/github.com/Sirupsen/logrus/README.md b/vendor/github.com/Sirupsen/logrus/README.md similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/README.md rename to vendor/github.com/Sirupsen/logrus/README.md diff --git a/vendor/src/github.com/Sirupsen/logrus/doc.go b/vendor/github.com/Sirupsen/logrus/doc.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/doc.go rename to vendor/github.com/Sirupsen/logrus/doc.go diff --git a/vendor/src/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/Sirupsen/logrus/entry.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/entry.go rename to vendor/github.com/Sirupsen/logrus/entry.go diff --git a/vendor/src/github.com/Sirupsen/logrus/exported.go b/vendor/github.com/Sirupsen/logrus/exported.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/exported.go rename to vendor/github.com/Sirupsen/logrus/exported.go diff --git a/vendor/src/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/Sirupsen/logrus/formatter.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/formatter.go rename to vendor/github.com/Sirupsen/logrus/formatter.go diff --git a/vendor/src/github.com/Sirupsen/logrus/hooks.go b/vendor/github.com/Sirupsen/logrus/hooks.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/hooks.go rename to vendor/github.com/Sirupsen/logrus/hooks.go diff --git a/vendor/src/github.com/Sirupsen/logrus/json_formatter.go b/vendor/github.com/Sirupsen/logrus/json_formatter.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/json_formatter.go rename to vendor/github.com/Sirupsen/logrus/json_formatter.go diff --git a/vendor/src/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/Sirupsen/logrus/logger.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/logger.go rename to vendor/github.com/Sirupsen/logrus/logger.go diff --git a/vendor/src/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/Sirupsen/logrus/logrus.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/logrus.go rename to vendor/github.com/Sirupsen/logrus/logrus.go diff --git a/vendor/src/github.com/Sirupsen/logrus/terminal_bsd.go b/vendor/github.com/Sirupsen/logrus/terminal_bsd.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/terminal_bsd.go rename to vendor/github.com/Sirupsen/logrus/terminal_bsd.go diff --git a/vendor/src/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/Sirupsen/logrus/terminal_linux.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/terminal_linux.go rename to vendor/github.com/Sirupsen/logrus/terminal_linux.go diff --git a/vendor/src/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/terminal_notwindows.go rename to vendor/github.com/Sirupsen/logrus/terminal_notwindows.go diff --git a/vendor/src/github.com/Sirupsen/logrus/terminal_solaris.go b/vendor/github.com/Sirupsen/logrus/terminal_solaris.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/terminal_solaris.go rename to vendor/github.com/Sirupsen/logrus/terminal_solaris.go diff --git a/vendor/src/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/Sirupsen/logrus/terminal_windows.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/terminal_windows.go rename to vendor/github.com/Sirupsen/logrus/terminal_windows.go diff --git a/vendor/src/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/Sirupsen/logrus/text_formatter.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/text_formatter.go rename to vendor/github.com/Sirupsen/logrus/text_formatter.go diff --git a/vendor/src/github.com/Sirupsen/logrus/writer.go b/vendor/github.com/Sirupsen/logrus/writer.go similarity index 100% rename from vendor/src/github.com/Sirupsen/logrus/writer.go rename to vendor/github.com/Sirupsen/logrus/writer.go diff --git a/vendor/src/github.com/docker/engine-api/LICENSE b/vendor/github.com/docker/engine-api/LICENSE similarity index 100% rename from vendor/src/github.com/docker/engine-api/LICENSE rename to vendor/github.com/docker/engine-api/LICENSE diff --git a/vendor/src/github.com/docker/engine-api/client/transport/cancellable/LICENSE b/vendor/github.com/docker/engine-api/client/transport/cancellable/LICENSE similarity index 100% rename from vendor/src/github.com/docker/engine-api/client/transport/cancellable/LICENSE rename to vendor/github.com/docker/engine-api/client/transport/cancellable/LICENSE diff --git a/vendor/src/github.com/docker/engine-api/types/filters/parse.go b/vendor/github.com/docker/engine-api/types/filters/parse.go similarity index 100% rename from vendor/src/github.com/docker/engine-api/types/filters/parse.go rename to vendor/github.com/docker/engine-api/types/filters/parse.go diff --git a/vendor/src/github.com/docker/engine-api/types/versions/README.md b/vendor/github.com/docker/engine-api/types/versions/README.md similarity index 100% rename from vendor/src/github.com/docker/engine-api/types/versions/README.md rename to vendor/github.com/docker/engine-api/types/versions/README.md diff --git a/vendor/src/github.com/docker/engine-api/types/versions/compare.go b/vendor/github.com/docker/engine-api/types/versions/compare.go similarity index 100% rename from vendor/src/github.com/docker/engine-api/types/versions/compare.go rename to vendor/github.com/docker/engine-api/types/versions/compare.go diff --git a/vendor/src/github.com/docker/go-connections/LICENSE b/vendor/github.com/docker/go-connections/LICENSE similarity index 100% rename from vendor/src/github.com/docker/go-connections/LICENSE rename to vendor/github.com/docker/go-connections/LICENSE diff --git a/vendor/src/github.com/docker/go-connections/sockets/README.md b/vendor/github.com/docker/go-connections/sockets/README.md similarity index 100% rename from vendor/src/github.com/docker/go-connections/sockets/README.md rename to vendor/github.com/docker/go-connections/sockets/README.md diff --git a/vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go b/vendor/github.com/docker/go-connections/sockets/inmem_socket.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/sockets/inmem_socket.go rename to vendor/github.com/docker/go-connections/sockets/inmem_socket.go diff --git a/vendor/src/github.com/docker/go-connections/sockets/proxy.go b/vendor/github.com/docker/go-connections/sockets/proxy.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/sockets/proxy.go rename to vendor/github.com/docker/go-connections/sockets/proxy.go diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets.go b/vendor/github.com/docker/go-connections/sockets/sockets.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/sockets/sockets.go rename to vendor/github.com/docker/go-connections/sockets/sockets.go diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go b/vendor/github.com/docker/go-connections/sockets/sockets_unix.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/sockets/sockets_unix.go rename to vendor/github.com/docker/go-connections/sockets/sockets_unix.go diff --git a/vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go b/vendor/github.com/docker/go-connections/sockets/sockets_windows.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/sockets/sockets_windows.go rename to vendor/github.com/docker/go-connections/sockets/sockets_windows.go diff --git a/vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go b/vendor/github.com/docker/go-connections/sockets/tcp_socket.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/sockets/tcp_socket.go rename to vendor/github.com/docker/go-connections/sockets/tcp_socket.go diff --git a/vendor/src/github.com/docker/go-connections/sockets/unix_socket.go b/vendor/github.com/docker/go-connections/sockets/unix_socket.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/sockets/unix_socket.go rename to vendor/github.com/docker/go-connections/sockets/unix_socket.go diff --git a/vendor/src/github.com/docker/go-connections/tlsconfig/config.go b/vendor/github.com/docker/go-connections/tlsconfig/config.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/tlsconfig/config.go rename to vendor/github.com/docker/go-connections/tlsconfig/config.go diff --git a/vendor/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go rename to vendor/github.com/docker/go-connections/tlsconfig/config_client_ciphers.go diff --git a/vendor/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go b/vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go similarity index 100% rename from vendor/src/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go rename to vendor/github.com/docker/go-connections/tlsconfig/config_legacy_client_ciphers.go diff --git a/vendor/src/github.com/docker/go-units/LICENSE b/vendor/github.com/docker/go-units/LICENSE similarity index 100% rename from vendor/src/github.com/docker/go-units/LICENSE rename to vendor/github.com/docker/go-units/LICENSE diff --git a/vendor/src/github.com/docker/go-units/README.md b/vendor/github.com/docker/go-units/README.md similarity index 100% rename from vendor/src/github.com/docker/go-units/README.md rename to vendor/github.com/docker/go-units/README.md diff --git a/vendor/src/github.com/docker/go-units/circle.yml b/vendor/github.com/docker/go-units/circle.yml similarity index 100% rename from vendor/src/github.com/docker/go-units/circle.yml rename to vendor/github.com/docker/go-units/circle.yml diff --git a/vendor/src/github.com/docker/go-units/duration.go b/vendor/github.com/docker/go-units/duration.go similarity index 100% rename from vendor/src/github.com/docker/go-units/duration.go rename to vendor/github.com/docker/go-units/duration.go diff --git a/vendor/src/github.com/docker/go-units/size.go b/vendor/github.com/docker/go-units/size.go similarity index 100% rename from vendor/src/github.com/docker/go-units/size.go rename to vendor/github.com/docker/go-units/size.go diff --git a/vendor/src/github.com/docker/go-units/ulimit.go b/vendor/github.com/docker/go-units/ulimit.go similarity index 100% rename from vendor/src/github.com/docker/go-units/ulimit.go rename to vendor/github.com/docker/go-units/ulimit.go diff --git a/vendor/src/github.com/mistifyio/go-zfs/.gitignore b/vendor/github.com/mistifyio/go-zfs/.gitignore similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/.gitignore rename to vendor/github.com/mistifyio/go-zfs/.gitignore diff --git a/vendor/src/github.com/mistifyio/go-zfs/.travis.yml b/vendor/github.com/mistifyio/go-zfs/.travis.yml similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/.travis.yml rename to vendor/github.com/mistifyio/go-zfs/.travis.yml diff --git a/vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md b/vendor/github.com/mistifyio/go-zfs/CONTRIBUTING.md similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/CONTRIBUTING.md rename to vendor/github.com/mistifyio/go-zfs/CONTRIBUTING.md diff --git a/vendor/src/github.com/mistifyio/go-zfs/LICENSE b/vendor/github.com/mistifyio/go-zfs/LICENSE similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/LICENSE rename to vendor/github.com/mistifyio/go-zfs/LICENSE diff --git a/vendor/src/github.com/mistifyio/go-zfs/README.md b/vendor/github.com/mistifyio/go-zfs/README.md similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/README.md rename to vendor/github.com/mistifyio/go-zfs/README.md diff --git a/vendor/src/github.com/mistifyio/go-zfs/error.go b/vendor/github.com/mistifyio/go-zfs/error.go similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/error.go rename to vendor/github.com/mistifyio/go-zfs/error.go diff --git a/vendor/src/github.com/mistifyio/go-zfs/utils.go b/vendor/github.com/mistifyio/go-zfs/utils.go similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/utils.go rename to vendor/github.com/mistifyio/go-zfs/utils.go diff --git a/vendor/src/github.com/mistifyio/go-zfs/utils_notsolaris.go b/vendor/github.com/mistifyio/go-zfs/utils_notsolaris.go similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/utils_notsolaris.go rename to vendor/github.com/mistifyio/go-zfs/utils_notsolaris.go diff --git a/vendor/src/github.com/mistifyio/go-zfs/utils_solaris.go b/vendor/github.com/mistifyio/go-zfs/utils_solaris.go similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/utils_solaris.go rename to vendor/github.com/mistifyio/go-zfs/utils_solaris.go diff --git a/vendor/src/github.com/mistifyio/go-zfs/zfs.go b/vendor/github.com/mistifyio/go-zfs/zfs.go similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/zfs.go rename to vendor/github.com/mistifyio/go-zfs/zfs.go diff --git a/vendor/src/github.com/mistifyio/go-zfs/zpool.go b/vendor/github.com/mistifyio/go-zfs/zpool.go similarity index 100% rename from vendor/src/github.com/mistifyio/go-zfs/zpool.go rename to vendor/github.com/mistifyio/go-zfs/zpool.go diff --git a/vendor/src/github.com/opencontainers/runc/LICENSE b/vendor/github.com/opencontainers/runc/LICENSE similarity index 100% rename from vendor/src/github.com/opencontainers/runc/LICENSE rename to vendor/github.com/opencontainers/runc/LICENSE diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/label/label.go b/vendor/github.com/opencontainers/runc/libcontainer/label/label.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/label/label.go rename to vendor/github.com/opencontainers/runc/libcontainer/label/label.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go b/vendor/github.com/opencontainers/runc/libcontainer/label/label_selinux.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go rename to vendor/github.com/opencontainers/runc/libcontainer/label/label_selinux.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/linux.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/proc.go b/vendor/github.com/opencontainers/runc/libcontainer/system/proc.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/proc.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/proc.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/setns_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/setns_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go b/vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/sysconfig.go b/vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/sysconfig.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go b/vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/system/unsupported.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/unsupported.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go rename to vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS b/vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS rename to vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup.go rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go diff --git a/vendor/src/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go similarity index 100% rename from vendor/src/github.com/opencontainers/runc/libcontainer/user/user.go rename to vendor/github.com/opencontainers/runc/libcontainer/user/user.go diff --git a/vendor/src/github.com/pborman/uuid/.travis.yml b/vendor/github.com/pborman/uuid/.travis.yml similarity index 100% rename from vendor/src/github.com/pborman/uuid/.travis.yml rename to vendor/github.com/pborman/uuid/.travis.yml diff --git a/vendor/src/github.com/pborman/uuid/CONTRIBUTORS b/vendor/github.com/pborman/uuid/CONTRIBUTORS similarity index 100% rename from vendor/src/github.com/pborman/uuid/CONTRIBUTORS rename to vendor/github.com/pborman/uuid/CONTRIBUTORS diff --git a/vendor/src/github.com/pborman/uuid/LICENSE b/vendor/github.com/pborman/uuid/LICENSE similarity index 100% rename from vendor/src/github.com/pborman/uuid/LICENSE rename to vendor/github.com/pborman/uuid/LICENSE diff --git a/vendor/src/github.com/pborman/uuid/README.md b/vendor/github.com/pborman/uuid/README.md similarity index 100% rename from vendor/src/github.com/pborman/uuid/README.md rename to vendor/github.com/pborman/uuid/README.md diff --git a/vendor/src/github.com/pborman/uuid/dce.go b/vendor/github.com/pborman/uuid/dce.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/dce.go rename to vendor/github.com/pborman/uuid/dce.go diff --git a/vendor/src/github.com/pborman/uuid/doc.go b/vendor/github.com/pborman/uuid/doc.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/doc.go rename to vendor/github.com/pborman/uuid/doc.go diff --git a/vendor/src/github.com/pborman/uuid/hash.go b/vendor/github.com/pborman/uuid/hash.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/hash.go rename to vendor/github.com/pborman/uuid/hash.go diff --git a/vendor/src/github.com/pborman/uuid/json.go b/vendor/github.com/pborman/uuid/json.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/json.go rename to vendor/github.com/pborman/uuid/json.go diff --git a/vendor/src/github.com/pborman/uuid/node.go b/vendor/github.com/pborman/uuid/node.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/node.go rename to vendor/github.com/pborman/uuid/node.go diff --git a/vendor/src/github.com/pborman/uuid/sql.go b/vendor/github.com/pborman/uuid/sql.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/sql.go rename to vendor/github.com/pborman/uuid/sql.go diff --git a/vendor/src/github.com/pborman/uuid/time.go b/vendor/github.com/pborman/uuid/time.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/time.go rename to vendor/github.com/pborman/uuid/time.go diff --git a/vendor/src/github.com/pborman/uuid/util.go b/vendor/github.com/pborman/uuid/util.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/util.go rename to vendor/github.com/pborman/uuid/util.go diff --git a/vendor/src/github.com/pborman/uuid/uuid.go b/vendor/github.com/pborman/uuid/uuid.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/uuid.go rename to vendor/github.com/pborman/uuid/uuid.go diff --git a/vendor/src/github.com/pborman/uuid/version1.go b/vendor/github.com/pborman/uuid/version1.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/version1.go rename to vendor/github.com/pborman/uuid/version1.go diff --git a/vendor/src/github.com/pborman/uuid/version4.go b/vendor/github.com/pborman/uuid/version4.go similarity index 100% rename from vendor/src/github.com/pborman/uuid/version4.go rename to vendor/github.com/pborman/uuid/version4.go diff --git a/vendor/src/github.com/vbatts/tar-split/LICENSE b/vendor/github.com/vbatts/tar-split/LICENSE similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/LICENSE rename to vendor/github.com/vbatts/tar-split/LICENSE diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/common.go b/vendor/github.com/vbatts/tar-split/archive/tar/common.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/archive/tar/common.go rename to vendor/github.com/vbatts/tar-split/archive/tar/common.go diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/reader.go b/vendor/github.com/vbatts/tar-split/archive/tar/reader.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/archive/tar/reader.go rename to vendor/github.com/vbatts/tar-split/archive/tar/reader.go diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/stat_atim.go b/vendor/github.com/vbatts/tar-split/archive/tar/stat_atim.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/archive/tar/stat_atim.go rename to vendor/github.com/vbatts/tar-split/archive/tar/stat_atim.go diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go b/vendor/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go rename to vendor/github.com/vbatts/tar-split/archive/tar/stat_atimespec.go diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/stat_unix.go b/vendor/github.com/vbatts/tar-split/archive/tar/stat_unix.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/archive/tar/stat_unix.go rename to vendor/github.com/vbatts/tar-split/archive/tar/stat_unix.go diff --git a/vendor/src/github.com/vbatts/tar-split/archive/tar/writer.go b/vendor/github.com/vbatts/tar-split/archive/tar/writer.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/archive/tar/writer.go rename to vendor/github.com/vbatts/tar-split/archive/tar/writer.go diff --git a/vendor/src/github.com/vbatts/tar-split/tar/asm/README.md b/vendor/github.com/vbatts/tar-split/tar/asm/README.md similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/tar/asm/README.md rename to vendor/github.com/vbatts/tar-split/tar/asm/README.md diff --git a/vendor/src/github.com/vbatts/tar-split/tar/asm/assemble.go b/vendor/github.com/vbatts/tar-split/tar/asm/assemble.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/tar/asm/assemble.go rename to vendor/github.com/vbatts/tar-split/tar/asm/assemble.go diff --git a/vendor/src/github.com/vbatts/tar-split/tar/asm/disassemble.go b/vendor/github.com/vbatts/tar-split/tar/asm/disassemble.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/tar/asm/disassemble.go rename to vendor/github.com/vbatts/tar-split/tar/asm/disassemble.go diff --git a/vendor/src/github.com/vbatts/tar-split/tar/asm/doc.go b/vendor/github.com/vbatts/tar-split/tar/asm/doc.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/tar/asm/doc.go rename to vendor/github.com/vbatts/tar-split/tar/asm/doc.go diff --git a/vendor/src/github.com/vbatts/tar-split/tar/storage/doc.go b/vendor/github.com/vbatts/tar-split/tar/storage/doc.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/tar/storage/doc.go rename to vendor/github.com/vbatts/tar-split/tar/storage/doc.go diff --git a/vendor/src/github.com/vbatts/tar-split/tar/storage/entry.go b/vendor/github.com/vbatts/tar-split/tar/storage/entry.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/tar/storage/entry.go rename to vendor/github.com/vbatts/tar-split/tar/storage/entry.go diff --git a/vendor/src/github.com/vbatts/tar-split/tar/storage/getter.go b/vendor/github.com/vbatts/tar-split/tar/storage/getter.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/tar/storage/getter.go rename to vendor/github.com/vbatts/tar-split/tar/storage/getter.go diff --git a/vendor/src/github.com/vbatts/tar-split/tar/storage/packer.go b/vendor/github.com/vbatts/tar-split/tar/storage/packer.go similarity index 100% rename from vendor/src/github.com/vbatts/tar-split/tar/storage/packer.go rename to vendor/github.com/vbatts/tar-split/tar/storage/packer.go diff --git a/vendor/src/golang.org/x/net/LICENSE b/vendor/golang.org/x/net/LICENSE similarity index 100% rename from vendor/src/golang.org/x/net/LICENSE rename to vendor/golang.org/x/net/LICENSE diff --git a/vendor/src/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go similarity index 100% rename from vendor/src/golang.org/x/net/context/context.go rename to vendor/golang.org/x/net/context/context.go diff --git a/vendor/src/golang.org/x/net/proxy/direct.go b/vendor/golang.org/x/net/proxy/direct.go similarity index 100% rename from vendor/src/golang.org/x/net/proxy/direct.go rename to vendor/golang.org/x/net/proxy/direct.go diff --git a/vendor/src/golang.org/x/net/proxy/per_host.go b/vendor/golang.org/x/net/proxy/per_host.go similarity index 100% rename from vendor/src/golang.org/x/net/proxy/per_host.go rename to vendor/golang.org/x/net/proxy/per_host.go diff --git a/vendor/src/golang.org/x/net/proxy/proxy.go b/vendor/golang.org/x/net/proxy/proxy.go similarity index 100% rename from vendor/src/golang.org/x/net/proxy/proxy.go rename to vendor/golang.org/x/net/proxy/proxy.go diff --git a/vendor/src/golang.org/x/net/proxy/socks5.go b/vendor/golang.org/x/net/proxy/socks5.go similarity index 100% rename from vendor/src/golang.org/x/net/proxy/socks5.go rename to vendor/golang.org/x/net/proxy/socks5.go diff --git a/vendor/src/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE similarity index 100% rename from vendor/src/golang.org/x/sys/LICENSE rename to vendor/golang.org/x/sys/LICENSE diff --git a/vendor/src/golang.org/x/sys/windows/asm.s b/vendor/golang.org/x/sys/windows/asm.s similarity index 100% rename from vendor/src/golang.org/x/sys/windows/asm.s rename to vendor/golang.org/x/sys/windows/asm.s diff --git a/vendor/src/golang.org/x/sys/windows/asm_windows_386.s b/vendor/golang.org/x/sys/windows/asm_windows_386.s similarity index 100% rename from vendor/src/golang.org/x/sys/windows/asm_windows_386.s rename to vendor/golang.org/x/sys/windows/asm_windows_386.s diff --git a/vendor/src/golang.org/x/sys/windows/asm_windows_amd64.s b/vendor/golang.org/x/sys/windows/asm_windows_amd64.s similarity index 100% rename from vendor/src/golang.org/x/sys/windows/asm_windows_amd64.s rename to vendor/golang.org/x/sys/windows/asm_windows_amd64.s diff --git a/vendor/src/golang.org/x/sys/windows/dll_windows.go b/vendor/golang.org/x/sys/windows/dll_windows.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/dll_windows.go rename to vendor/golang.org/x/sys/windows/dll_windows.go diff --git a/vendor/src/golang.org/x/sys/windows/env_unset.go b/vendor/golang.org/x/sys/windows/env_unset.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/env_unset.go rename to vendor/golang.org/x/sys/windows/env_unset.go diff --git a/vendor/src/golang.org/x/sys/windows/env_windows.go b/vendor/golang.org/x/sys/windows/env_windows.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/env_windows.go rename to vendor/golang.org/x/sys/windows/env_windows.go diff --git a/vendor/src/golang.org/x/sys/windows/eventlog.go b/vendor/golang.org/x/sys/windows/eventlog.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/eventlog.go rename to vendor/golang.org/x/sys/windows/eventlog.go diff --git a/vendor/src/golang.org/x/sys/windows/exec_windows.go b/vendor/golang.org/x/sys/windows/exec_windows.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/exec_windows.go rename to vendor/golang.org/x/sys/windows/exec_windows.go diff --git a/vendor/src/golang.org/x/sys/windows/race.go b/vendor/golang.org/x/sys/windows/race.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/race.go rename to vendor/golang.org/x/sys/windows/race.go diff --git a/vendor/src/golang.org/x/sys/windows/race0.go b/vendor/golang.org/x/sys/windows/race0.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/race0.go rename to vendor/golang.org/x/sys/windows/race0.go diff --git a/vendor/src/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/security_windows.go rename to vendor/golang.org/x/sys/windows/security_windows.go diff --git a/vendor/src/golang.org/x/sys/windows/service.go b/vendor/golang.org/x/sys/windows/service.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/service.go rename to vendor/golang.org/x/sys/windows/service.go diff --git a/vendor/src/golang.org/x/sys/windows/str.go b/vendor/golang.org/x/sys/windows/str.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/str.go rename to vendor/golang.org/x/sys/windows/str.go diff --git a/vendor/src/golang.org/x/sys/windows/syscall.go b/vendor/golang.org/x/sys/windows/syscall.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/syscall.go rename to vendor/golang.org/x/sys/windows/syscall.go diff --git a/vendor/src/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/syscall_windows.go rename to vendor/golang.org/x/sys/windows/syscall_windows.go diff --git a/vendor/src/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/zsyscall_windows.go rename to vendor/golang.org/x/sys/windows/zsyscall_windows.go diff --git a/vendor/src/golang.org/x/sys/windows/ztypes_windows.go b/vendor/golang.org/x/sys/windows/ztypes_windows.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/ztypes_windows.go rename to vendor/golang.org/x/sys/windows/ztypes_windows.go diff --git a/vendor/src/golang.org/x/sys/windows/ztypes_windows_386.go b/vendor/golang.org/x/sys/windows/ztypes_windows_386.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/ztypes_windows_386.go rename to vendor/golang.org/x/sys/windows/ztypes_windows_386.go diff --git a/vendor/src/golang.org/x/sys/windows/ztypes_windows_amd64.go b/vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go similarity index 100% rename from vendor/src/golang.org/x/sys/windows/ztypes_windows_amd64.go rename to vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go