From b6e591d46e502a02c2953be7089f4d28742c8c09 Mon Sep 17 00:00:00 2001 From: "Chun-Yu Lee (Mat)" Date: Fri, 14 Nov 2014 12:39:50 +0800 Subject: [PATCH] Update vendor revision and Manifest file --- Manifest | 49 ++++++++++++++++++++++++++++++----------------- scripts/vendor.sh | 4 ++-- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Manifest b/Manifest index 99a3196..e125d3d 100644 --- a/Manifest +++ b/Manifest @@ -17,6 +17,9 @@ ./api/server2/server_test.go ./builtins/builtins.go ./configure +./dockerfiles/fedora/heisenbug/Dockerfile +./dockerfiles/ubuntu/trusty/Dockerfile +./dockerfiles/ubuntu/utopic/Dockerfile ./misc/001.patch ./misc/002.patch ./misc/003.patch @@ -49,6 +52,7 @@ ./mods/osver/osver_windows_test.go ./mods/ping/ping.go ./mods/ping/ping_test.go +./mods/route/README.md ./mods/route/main.go ./mods/sample/sample.go ./mods/sysfs/main.go @@ -181,7 +185,6 @@ ./vendor/src/github.com/Sirupsen/logrus/LICENSE ./vendor/src/github.com/Sirupsen/logrus/README.md ./vendor/src/github.com/Sirupsen/logrus/entry.go -./vendor/src/github.com/Sirupsen/logrus/entry_test.go ./vendor/src/github.com/Sirupsen/logrus/examples/basic/basic.go ./vendor/src/github.com/Sirupsen/logrus/examples/hook/hook.go ./vendor/src/github.com/Sirupsen/logrus/exported.go @@ -210,11 +213,11 @@ ./vendor/src/github.com/docker/docker/.drone.yml ./vendor/src/github.com/docker/docker/.gitignore ./vendor/src/github.com/docker/docker/.mailmap +./vendor/src/github.com/docker/docker/.travis.yml ./vendor/src/github.com/docker/docker/AUTHORS ./vendor/src/github.com/docker/docker/CHANGELOG.md ./vendor/src/github.com/docker/docker/CONTRIBUTING.md ./vendor/src/github.com/docker/docker/Dockerfile -./vendor/src/github.com/docker/docker/GOVERNANCE.md ./vendor/src/github.com/docker/docker/LICENSE ./vendor/src/github.com/docker/docker/MAINTAINERS ./vendor/src/github.com/docker/docker/Makefile @@ -292,7 +295,6 @@ ./vendor/src/github.com/docker/docker/contrib/MAINTAINERS ./vendor/src/github.com/docker/docker/contrib/README ./vendor/src/github.com/docker/docker/contrib/check-config.sh -./vendor/src/github.com/docker/docker/contrib/completion/MAINTAINERS ./vendor/src/github.com/docker/docker/contrib/completion/bash/docker ./vendor/src/github.com/docker/docker/contrib/completion/fish/docker.fish ./vendor/src/github.com/docker/docker/contrib/completion/zsh/_docker @@ -315,7 +317,6 @@ ./vendor/src/github.com/docker/docker/contrib/init/sysvinit-debian/docker.default ./vendor/src/github.com/docker/docker/contrib/init/sysvinit-redhat/docker ./vendor/src/github.com/docker/docker/contrib/init/sysvinit-redhat/docker.sysconfig -./vendor/src/github.com/docker/docker/contrib/init/upstart/MAINTAINERS ./vendor/src/github.com/docker/docker/contrib/init/upstart/docker.conf ./vendor/src/github.com/docker/docker/contrib/mkimage-alpine.sh ./vendor/src/github.com/docker/docker/contrib/mkimage-arch-pacman.conf @@ -359,7 +360,6 @@ ./vendor/src/github.com/docker/docker/daemon/copy.go ./vendor/src/github.com/docker/docker/daemon/create.go ./vendor/src/github.com/docker/docker/daemon/daemon.go -./vendor/src/github.com/docker/docker/daemon/daemon.go.orig ./vendor/src/github.com/docker/docker/daemon/daemon_aufs.go ./vendor/src/github.com/docker/docker/daemon/daemon_btrfs.go ./vendor/src/github.com/docker/docker/daemon/daemon_devicemapper.go @@ -461,7 +461,6 @@ ./vendor/src/github.com/docker/docker/docker/daemon.go ./vendor/src/github.com/docker/docker/docker/docker.go ./vendor/src/github.com/docker/docker/docker/flags.go -./vendor/src/github.com/docker/docker/docker/log.go ./vendor/src/github.com/docker/docker/dockerinit/dockerinit.go ./vendor/src/github.com/docker/docker/dockerversion/dockerversion.go ./vendor/src/github.com/docker/docker/engine/MAINTAINERS @@ -533,9 +532,29 @@ ./vendor/src/github.com/docker/docker/image/graph.go ./vendor/src/github.com/docker/docker/image/image.go ./vendor/src/github.com/docker/docker/integration-cli/MAINTAINERS -./vendor/src/github.com/docker/docker/integration-cli/docker_api_containers_test.go +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DirContentToExistDir/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DirContentToExistDir/test_dir/test_file +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DirContentToRoot/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DirContentToRoot/test_dir/test_file +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DisallowRemote/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/EtcToRoot/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/test_file1 +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/test_file2 +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/test_file3 +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/test_file4 +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFilesToFile/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFilesToFile/test_file1 +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFilesToFile/test_file2 +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFilesToFile/test_file3 +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToExistDir/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToExistDir/test_file +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToNonExistDir/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToNonExistDir/test_file +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToRoot/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToWorkdir/Dockerfile +./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/WholeDirToRoot/Dockerfile ./vendor/src/github.com/docker/docker/integration-cli/docker_api_inspect_test.go -./vendor/src/github.com/docker/docker/integration-cli/docker_api_resize_test.go ./vendor/src/github.com/docker/docker/integration-cli/docker_cli_attach_test.go ./vendor/src/github.com/docker/docker/integration-cli/docker_cli_build_test.go ./vendor/src/github.com/docker/docker/integration-cli/docker_cli_commit_test.go @@ -610,7 +629,6 @@ ./vendor/src/github.com/docker/docker/pkg/archive/changes.go ./vendor/src/github.com/docker/docker/pkg/archive/changes_test.go ./vendor/src/github.com/docker/docker/pkg/archive/diff.go -./vendor/src/github.com/docker/docker/pkg/archive/example_changes.go ./vendor/src/github.com/docker/docker/pkg/archive/testdata/broken.tar ./vendor/src/github.com/docker/docker/pkg/archive/time_linux.go ./vendor/src/github.com/docker/docker/pkg/archive/time_unsupported.go @@ -637,6 +655,8 @@ ./vendor/src/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling.go ./vendor/src/github.com/docker/docker/pkg/jsonlog/jsonlog_test.go ./vendor/src/github.com/docker/docker/pkg/listenbuffer/buffer.go +./vendor/src/github.com/docker/docker/pkg/log/log.go +./vendor/src/github.com/docker/docker/pkg/log/log_test.go ./vendor/src/github.com/docker/docker/pkg/mflag/LICENSE ./vendor/src/github.com/docker/docker/pkg/mflag/MAINTAINERS ./vendor/src/github.com/docker/docker/pkg/mflag/README.md @@ -658,7 +678,6 @@ ./vendor/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go ./vendor/src/github.com/docker/docker/pkg/mount/mountinfo_linux_test.go ./vendor/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go -./vendor/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go ./vendor/src/github.com/docker/docker/pkg/namesgenerator/names-generator.go ./vendor/src/github.com/docker/docker/pkg/namesgenerator/names-generator_test.go ./vendor/src/github.com/docker/docker/pkg/networkfs/MAINTAINERS @@ -686,9 +705,6 @@ ./vendor/src/github.com/docker/docker/pkg/proxy/stub_proxy.go ./vendor/src/github.com/docker/docker/pkg/proxy/tcp_proxy.go ./vendor/src/github.com/docker/docker/pkg/proxy/udp_proxy.go -./vendor/src/github.com/docker/docker/pkg/reexec/MAINTAINERS -./vendor/src/github.com/docker/docker/pkg/reexec/README.md -./vendor/src/github.com/docker/docker/pkg/reexec/reexec.go ./vendor/src/github.com/docker/docker/pkg/signal/signal.go ./vendor/src/github.com/docker/docker/pkg/signal/signal_darwin.go ./vendor/src/github.com/docker/docker/pkg/signal/signal_freebsd.go @@ -705,10 +721,6 @@ ./vendor/src/github.com/docker/docker/pkg/sysinfo/sysinfo.go ./vendor/src/github.com/docker/docker/pkg/system/MAINTAINERS ./vendor/src/github.com/docker/docker/pkg/system/errors.go -./vendor/src/github.com/docker/docker/pkg/system/meminfo.go -./vendor/src/github.com/docker/docker/pkg/system/meminfo_linux.go -./vendor/src/github.com/docker/docker/pkg/system/meminfo_linux_test.go -./vendor/src/github.com/docker/docker/pkg/system/meminfo_unsupported.go ./vendor/src/github.com/docker/docker/pkg/system/stat_linux.go ./vendor/src/github.com/docker/docker/pkg/system/stat_unsupported.go ./vendor/src/github.com/docker/docker/pkg/system/utimes_darwin.go @@ -762,11 +774,12 @@ ./vendor/src/github.com/docker/docker/pkg/units/size_test.go ./vendor/src/github.com/docker/docker/pkg/version/version.go ./vendor/src/github.com/docker/docker/pkg/version/version_test.go +./vendor/src/github.com/docker/docker/reexec/README.md +./vendor/src/github.com/docker/docker/reexec/reexec.go ./vendor/src/github.com/docker/docker/registry/MAINTAINERS ./vendor/src/github.com/docker/docker/registry/auth.go ./vendor/src/github.com/docker/docker/registry/auth_test.go ./vendor/src/github.com/docker/docker/registry/endpoint.go -./vendor/src/github.com/docker/docker/registry/endpoint_test.go ./vendor/src/github.com/docker/docker/registry/httpfactory.go ./vendor/src/github.com/docker/docker/registry/registry.go ./vendor/src/github.com/docker/docker/registry/registry_mock_test.go diff --git a/scripts/vendor.sh b/scripts/vendor.sh index e2293a9..489de5e 100755 --- a/scripts/vendor.sh +++ b/scripts/vendor.sh @@ -64,11 +64,11 @@ function do_patch(){ set -e } -clone git f92b795 github.com/Sirupsen/logrus +clone git v0.6.0 github.com/Sirupsen/logrus clone git e444e69 github.com/gorilla/mux clone git 14f550f github.com/gorilla/context clone git 6070b2c github.com/tsaikd/KDGoLib -clone git 3afe9db github.com/docker/docker +clone git v1.3.1 github.com/docker/docker do_patch "$ROOT/misc/001.patch" "$VENDOR/src/github.com/docker/libcontainer" do_patch "$ROOT/misc/002.patch" "$VENDOR/src/github.com/docker/docker"