Skip to content

Commit b6e591d

Browse files
committed
Update vendor revision and Manifest file
1 parent eef6f96 commit b6e591d

File tree

2 files changed

+33
-20
lines changed

2 files changed

+33
-20
lines changed

Manifest

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
./api/server2/server_test.go
1818
./builtins/builtins.go
1919
./configure
20+
./dockerfiles/fedora/heisenbug/Dockerfile
21+
./dockerfiles/ubuntu/trusty/Dockerfile
22+
./dockerfiles/ubuntu/utopic/Dockerfile
2023
./misc/001.patch
2124
./misc/002.patch
2225
./misc/003.patch
@@ -49,6 +52,7 @@
4952
./mods/osver/osver_windows_test.go
5053
./mods/ping/ping.go
5154
./mods/ping/ping_test.go
55+
./mods/route/README.md
5256
./mods/route/main.go
5357
./mods/sample/sample.go
5458
./mods/sysfs/main.go
@@ -181,7 +185,6 @@
181185
./vendor/src/github.com/Sirupsen/logrus/LICENSE
182186
./vendor/src/github.com/Sirupsen/logrus/README.md
183187
./vendor/src/github.com/Sirupsen/logrus/entry.go
184-
./vendor/src/github.com/Sirupsen/logrus/entry_test.go
185188
./vendor/src/github.com/Sirupsen/logrus/examples/basic/basic.go
186189
./vendor/src/github.com/Sirupsen/logrus/examples/hook/hook.go
187190
./vendor/src/github.com/Sirupsen/logrus/exported.go
@@ -210,11 +213,11 @@
210213
./vendor/src/github.com/docker/docker/.drone.yml
211214
./vendor/src/github.com/docker/docker/.gitignore
212215
./vendor/src/github.com/docker/docker/.mailmap
216+
./vendor/src/github.com/docker/docker/.travis.yml
213217
./vendor/src/github.com/docker/docker/AUTHORS
214218
./vendor/src/github.com/docker/docker/CHANGELOG.md
215219
./vendor/src/github.com/docker/docker/CONTRIBUTING.md
216220
./vendor/src/github.com/docker/docker/Dockerfile
217-
./vendor/src/github.com/docker/docker/GOVERNANCE.md
218221
./vendor/src/github.com/docker/docker/LICENSE
219222
./vendor/src/github.com/docker/docker/MAINTAINERS
220223
./vendor/src/github.com/docker/docker/Makefile
@@ -292,7 +295,6 @@
292295
./vendor/src/github.com/docker/docker/contrib/MAINTAINERS
293296
./vendor/src/github.com/docker/docker/contrib/README
294297
./vendor/src/github.com/docker/docker/contrib/check-config.sh
295-
./vendor/src/github.com/docker/docker/contrib/completion/MAINTAINERS
296298
./vendor/src/github.com/docker/docker/contrib/completion/bash/docker
297299
./vendor/src/github.com/docker/docker/contrib/completion/fish/docker.fish
298300
./vendor/src/github.com/docker/docker/contrib/completion/zsh/_docker
@@ -315,7 +317,6 @@
315317
./vendor/src/github.com/docker/docker/contrib/init/sysvinit-debian/docker.default
316318
./vendor/src/github.com/docker/docker/contrib/init/sysvinit-redhat/docker
317319
./vendor/src/github.com/docker/docker/contrib/init/sysvinit-redhat/docker.sysconfig
318-
./vendor/src/github.com/docker/docker/contrib/init/upstart/MAINTAINERS
319320
./vendor/src/github.com/docker/docker/contrib/init/upstart/docker.conf
320321
./vendor/src/github.com/docker/docker/contrib/mkimage-alpine.sh
321322
./vendor/src/github.com/docker/docker/contrib/mkimage-arch-pacman.conf
@@ -359,7 +360,6 @@
359360
./vendor/src/github.com/docker/docker/daemon/copy.go
360361
./vendor/src/github.com/docker/docker/daemon/create.go
361362
./vendor/src/github.com/docker/docker/daemon/daemon.go
362-
./vendor/src/github.com/docker/docker/daemon/daemon.go.orig
363363
./vendor/src/github.com/docker/docker/daemon/daemon_aufs.go
364364
./vendor/src/github.com/docker/docker/daemon/daemon_btrfs.go
365365
./vendor/src/github.com/docker/docker/daemon/daemon_devicemapper.go
@@ -461,7 +461,6 @@
461461
./vendor/src/github.com/docker/docker/docker/daemon.go
462462
./vendor/src/github.com/docker/docker/docker/docker.go
463463
./vendor/src/github.com/docker/docker/docker/flags.go
464-
./vendor/src/github.com/docker/docker/docker/log.go
465464
./vendor/src/github.com/docker/docker/dockerinit/dockerinit.go
466465
./vendor/src/github.com/docker/docker/dockerversion/dockerversion.go
467466
./vendor/src/github.com/docker/docker/engine/MAINTAINERS
@@ -533,9 +532,29 @@
533532
./vendor/src/github.com/docker/docker/image/graph.go
534533
./vendor/src/github.com/docker/docker/image/image.go
535534
./vendor/src/github.com/docker/docker/integration-cli/MAINTAINERS
536-
./vendor/src/github.com/docker/docker/integration-cli/docker_api_containers_test.go
535+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DirContentToExistDir/Dockerfile
536+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DirContentToExistDir/test_dir/test_file
537+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DirContentToRoot/Dockerfile
538+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DirContentToRoot/test_dir/test_file
539+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/DisallowRemote/Dockerfile
540+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/EtcToRoot/Dockerfile
541+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/Dockerfile
542+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/test_file1
543+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/test_file2
544+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/test_file3
545+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFiles/test_file4
546+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFilesToFile/Dockerfile
547+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFilesToFile/test_file1
548+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFilesToFile/test_file2
549+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/MultipleFilesToFile/test_file3
550+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToExistDir/Dockerfile
551+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToExistDir/test_file
552+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToNonExistDir/Dockerfile
553+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToNonExistDir/test_file
554+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToRoot/Dockerfile
555+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/SingleFileToWorkdir/Dockerfile
556+
./vendor/src/github.com/docker/docker/integration-cli/build_tests/TestCopy/WholeDirToRoot/Dockerfile
537557
./vendor/src/github.com/docker/docker/integration-cli/docker_api_inspect_test.go
538-
./vendor/src/github.com/docker/docker/integration-cli/docker_api_resize_test.go
539558
./vendor/src/github.com/docker/docker/integration-cli/docker_cli_attach_test.go
540559
./vendor/src/github.com/docker/docker/integration-cli/docker_cli_build_test.go
541560
./vendor/src/github.com/docker/docker/integration-cli/docker_cli_commit_test.go
@@ -610,7 +629,6 @@
610629
./vendor/src/github.com/docker/docker/pkg/archive/changes.go
611630
./vendor/src/github.com/docker/docker/pkg/archive/changes_test.go
612631
./vendor/src/github.com/docker/docker/pkg/archive/diff.go
613-
./vendor/src/github.com/docker/docker/pkg/archive/example_changes.go
614632
./vendor/src/github.com/docker/docker/pkg/archive/testdata/broken.tar
615633
./vendor/src/github.com/docker/docker/pkg/archive/time_linux.go
616634
./vendor/src/github.com/docker/docker/pkg/archive/time_unsupported.go
@@ -637,6 +655,8 @@
637655
./vendor/src/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling.go
638656
./vendor/src/github.com/docker/docker/pkg/jsonlog/jsonlog_test.go
639657
./vendor/src/github.com/docker/docker/pkg/listenbuffer/buffer.go
658+
./vendor/src/github.com/docker/docker/pkg/log/log.go
659+
./vendor/src/github.com/docker/docker/pkg/log/log_test.go
640660
./vendor/src/github.com/docker/docker/pkg/mflag/LICENSE
641661
./vendor/src/github.com/docker/docker/pkg/mflag/MAINTAINERS
642662
./vendor/src/github.com/docker/docker/pkg/mflag/README.md
@@ -658,7 +678,6 @@
658678
./vendor/src/github.com/docker/docker/pkg/mount/mountinfo_linux.go
659679
./vendor/src/github.com/docker/docker/pkg/mount/mountinfo_linux_test.go
660680
./vendor/src/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go
661-
./vendor/src/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go
662681
./vendor/src/github.com/docker/docker/pkg/namesgenerator/names-generator.go
663682
./vendor/src/github.com/docker/docker/pkg/namesgenerator/names-generator_test.go
664683
./vendor/src/github.com/docker/docker/pkg/networkfs/MAINTAINERS
@@ -686,9 +705,6 @@
686705
./vendor/src/github.com/docker/docker/pkg/proxy/stub_proxy.go
687706
./vendor/src/github.com/docker/docker/pkg/proxy/tcp_proxy.go
688707
./vendor/src/github.com/docker/docker/pkg/proxy/udp_proxy.go
689-
./vendor/src/github.com/docker/docker/pkg/reexec/MAINTAINERS
690-
./vendor/src/github.com/docker/docker/pkg/reexec/README.md
691-
./vendor/src/github.com/docker/docker/pkg/reexec/reexec.go
692708
./vendor/src/github.com/docker/docker/pkg/signal/signal.go
693709
./vendor/src/github.com/docker/docker/pkg/signal/signal_darwin.go
694710
./vendor/src/github.com/docker/docker/pkg/signal/signal_freebsd.go
@@ -705,10 +721,6 @@
705721
./vendor/src/github.com/docker/docker/pkg/sysinfo/sysinfo.go
706722
./vendor/src/github.com/docker/docker/pkg/system/MAINTAINERS
707723
./vendor/src/github.com/docker/docker/pkg/system/errors.go
708-
./vendor/src/github.com/docker/docker/pkg/system/meminfo.go
709-
./vendor/src/github.com/docker/docker/pkg/system/meminfo_linux.go
710-
./vendor/src/github.com/docker/docker/pkg/system/meminfo_linux_test.go
711-
./vendor/src/github.com/docker/docker/pkg/system/meminfo_unsupported.go
712724
./vendor/src/github.com/docker/docker/pkg/system/stat_linux.go
713725
./vendor/src/github.com/docker/docker/pkg/system/stat_unsupported.go
714726
./vendor/src/github.com/docker/docker/pkg/system/utimes_darwin.go
@@ -762,11 +774,12 @@
762774
./vendor/src/github.com/docker/docker/pkg/units/size_test.go
763775
./vendor/src/github.com/docker/docker/pkg/version/version.go
764776
./vendor/src/github.com/docker/docker/pkg/version/version_test.go
777+
./vendor/src/github.com/docker/docker/reexec/README.md
778+
./vendor/src/github.com/docker/docker/reexec/reexec.go
765779
./vendor/src/github.com/docker/docker/registry/MAINTAINERS
766780
./vendor/src/github.com/docker/docker/registry/auth.go
767781
./vendor/src/github.com/docker/docker/registry/auth_test.go
768782
./vendor/src/github.com/docker/docker/registry/endpoint.go
769-
./vendor/src/github.com/docker/docker/registry/endpoint_test.go
770783
./vendor/src/github.com/docker/docker/registry/httpfactory.go
771784
./vendor/src/github.com/docker/docker/registry/registry.go
772785
./vendor/src/github.com/docker/docker/registry/registry_mock_test.go

scripts/vendor.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ function do_patch(){
6464
set -e
6565
}
6666

67-
clone git f92b795 github.com/Sirupsen/logrus
67+
clone git v0.6.0 github.com/Sirupsen/logrus
6868
clone git e444e69 github.com/gorilla/mux
6969
clone git 14f550f github.com/gorilla/context
7070
clone git 6070b2c github.com/tsaikd/KDGoLib
71-
clone git 3afe9db github.com/docker/docker
71+
clone git v1.3.1 github.com/docker/docker
7272

7373
do_patch "$ROOT/misc/001.patch" "$VENDOR/src/github.com/docker/libcontainer"
7474
do_patch "$ROOT/misc/002.patch" "$VENDOR/src/github.com/docker/docker"

0 commit comments

Comments
 (0)