docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,226 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

1318 Commits

Author SHA1 Message Date
kayrus 0f2b3191d9 Added possibility to use TLS with systemd socket activation 
Signed-off-by: kayrus <kay.diam@gmail.com>
 2015-11-13 17:01:23 +01:00
Tianon Gravi 8b9856dbd7 Merge pull request #17699 from jfrazelle/update-release-script-to-new-process 
update release script and release process
 2015-11-12 09:51:36 -08:00
David Calavera eed704f7d9 Merge pull request #17901 from runcom/remove-not-needed-func 
hack: make.sh: remove not used function
 2015-11-12 07:16:43 -08:00
Antonio Murdaca dc41fff56e hack: make.sh: remove not used function 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-11 10:19:03 +01:00
Alessandro Boch 43b3b6ecb4 Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-11-10 21:13:25 -08:00
Tibor Vass 09980ef7ac Merge pull request #17853 from aboch/ipr 
Fix fixed-cidr daemon option
 2015-11-10 23:38:33 -05:00
Paolo G. Giarrusso c5f24c7902 Fix link to installation instructions 
Fix #17872:

> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/, which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/.

Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
 2015-11-10 18:06:58 +01:00
Alessandro Boch 9c395537bc Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae 
- To bring in ip-range fix

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-11-09 15:29:54 -08:00
David Calavera 58b270c338 Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again 
Another try at dockerversion placeholder for library import
 2015-11-09 13:15:50 -08:00
Vincent Demeester e509fe604c Merge pull request #17816 from coolljt0725/remove_execdriver_env 
Remove DOCKER_EXECDRIVER env
 2015-11-09 19:59:18 +01:00
Vincent Demeester 8054a30387 dockerversion placeholder for library import 
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-09 19:32:46 +01:00
Alexander Morozov 00bcc924fa Update runc to introduce RelabelNeeded function 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-09 10:03:25 -08:00
Lei Jitang 3c4dab51d3 Remove DOCKER_EXECDRIVER env 
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.

Signed-off-by: Lei Jitang <leijiang@huawei.com>
 2015-11-09 09:17:32 +08:00
Jess Frazelle ea59233eb1 Merge pull request #16533 from justsml/LMDEv2 
LMDE check added to `check_forked()` function - See #16498
 2015-11-08 02:28:11 -08:00
Vincent Demeester e2a9eede28 Merge pull request #17786 from Microsoft/10662-nativetestunit 
Windows: Native make test-unit
 2015-11-08 11:12:09 +01:00
John Howard 7268f767e6 Windows: Native make test-unit 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-07 08:23:10 -08:00
David Calavera efc7b9bbf7 Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild 
Windows: Native build without link errors
 2015-11-07 08:22:35 -08:00
John Howard d92f7f42b2 Windows: Native daemon build 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-06 15:35:56 -08:00
John Howard 33faea576f Windows: Fix test-unit for local run 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-06 15:23:48 -08:00
Tianon Gravi 1c383af6ae Fix Windows support in .vendor-helpers.sh 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-11-06 12:07:24 -08:00
Solomon Hykes 2519f46550 Merge pull request #17700 from calavera/remove_lxc 
Remove LXC support.
 2015-11-05 15:22:37 -08:00
David Calavera 98ec6bc14c Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic 
Fix panic in parsing /etc/os-release
 2015-11-05 15:11:02 -08:00
David Calavera 157b66ad39 Remove exec-driver global daemon option. 
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-05 17:09:58 -05:00
David Calavera 3b5fac462d Remove LXC support. 
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-05 17:09:57 -05:00
Jess Frazelle 31fa27d47e Merge pull request #17496 from chasebolt/centos-rpm-dep 
setting device-mapper-libs version dependency for centos 7 rpm
 2015-11-05 13:46:27 -08:00
Vincent Demeester b09a452c1f Vendor mattn/go-shellwords 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-05 19:59:28 +01:00
Vincent Demeester f267e4be54 Merge pull request #17697 from jfrazelle/test-old-apt-repo 
add script to test the old apt-repo
 2015-11-05 12:11:57 +01:00
Jessica Frazelle d0a4b216a6
update release script and release process 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-04 16:20:04 -08:00
Jessica Frazelle 3f27479435
add script to test the old apt-repo 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-04 16:01:19 -08:00
Alexander Morozov b2f14f9bec Merge pull request #17639 from mrjana/restart 
Fix a corner case issue when daemon panics
 2015-11-04 13:37:45 -08:00
Srini Brahmaroutu 81b3d2eec9 after the changes to unit test framework, fixing gccgo to run unit tests 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-11-03 17:57:06 +00:00
kayrus 0a6acbede3 Updated vendor go-systemd with enabled TLS activation 
Signed-off-by: kayrus <kay.diam@gmail.com>
 2015-11-03 11:02:05 +01:00
Jana Radhakrishnan 79cffa5ce4 Fix a corner case issue when daemon panics 
There is an extreme corner case where when the daemon
panics at the same time as a container is stopping
and cleaning up the sandbox and the sandbox may have been
left with an inconsistent state. This libnetwork vendoring
fixes that case.

Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-11-02 18:37:35 -08:00
Derek McGowan 6964f42350 Merge pull request #17557 from aaronlehmann/update-distribution 
Vendor updated version of docker/distribution
 2015-11-02 14:37:04 -08:00
Aaron Lehmann 257c59251b Vendor updated version of docker/distribution 
This updates the vendored docker/distribution to the current master
branch.

Note the following changes:

- The manifest package was split into manifest/schema1. Most references
  to the manifest package in the engine needed to be updated to use
  schema1 instead.

- Validation functions in api/v2 were replaced by the
  distribution/reference package. The engine code has been updated to
  use the reference package for validation where necessary. A future PR
  will change the engine to use the types defined in
  distribution/reference more comprehensively.

- The reference package explicitly allows double _ characters in
  repository names. registry_test.go was updated for this.

- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
  that the schema1 package unmarshals the correct payload. The test is
  being changed to modify the JSON without affecting its length, which
  allows the pull to succeed to the point where digest validation
  happens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-11-02 12:40:18 -08:00
David Calavera b95048758a Merge pull request #17619 from jfrazelle/canonical-update 
rebased canonical/json off go 1.5.1
 2015-11-02 11:42:26 -08:00
David Calavera f962c0715f Merge pull request #17620 from vdemeester/unit-test-TESTDIRS 
Bring TESTDIRS back for unit-tests
 2015-11-02 11:41:19 -08:00
Vincent Demeester 4a54ab387f Add TESTDIRS back 
Makes it simpler to test only one package.
Was removed by #17491.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 19:44:09 +01:00
Jessica Frazelle 0d881349e8
rebased canonical/json off go 1.5.1 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-02 10:23:02 -08:00
Jana Radhakrishnan 10e1b9f02e Vendoring libnetwork 
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-11-02 08:33:52 -08:00
Madhu Venugopal 2361edbcea Vendoring in libnetwork to fix an ungraceful restart case 
Also picked up a minor typo fix

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-30 16:24:02 -07:00
Brian Goff 17a8fbeaeb Merge pull request #17514 from mavenugo/ugr 
Fixing a case of dangling endpoint during ungraceful daemon restart
 2015-10-30 13:38:27 -04:00
Tibor Vass c545dce004 Merge pull request #16640 from samuelkarp/awslogs-logging-driver 
[awslogs] Auto-detect region and set user-agent
 2015-10-30 12:38:40 -04:00
Madhu Venugopal ebf76171f6 Vendoring libnetwork to solve an ungraceful restart condition 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-29 18:56:17 -07:00
Jess Frazelle d30caedbf8 Merge pull request #17491 from LK4D4/seq_tests 
Run unit tests as single command
 2015-10-29 16:29:24 -07:00
Chase Bolt d8aaf96216 expand the list a bit more 
Signed-off-by: Chase Bolt <chase.bolt@gmail.com>
 2015-10-29 15:23:44 -07:00
Alexander Morozov 7f7950aa18 Merge pull request #17490 from aboch/pm 
Libnetwork vendoring & overlay networking fixes
 2015-10-29 13:45:19 -07:00
Chase Bolt 787d94626f setting device-mapper-libs version dependency for centos 7 rpm 
Signed-off-by: Chase Bolt <chase.bolt@gmail.com>
 2015-10-29 11:11:19 -07:00
Alexander Morozov 1c23de0e64 Run unit tests as single command 
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-10-29 09:39:51 -07:00
Alessandro Boch 90744fe943 Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-29 09:24:48 -07:00
Doug Davis b6e1f4dd69 Merge pull request #16898 from hqhq/hq_bump_bolt 
Bump bolt to v1.1.0
 2015-10-28 18:51:23 -04:00
Tibor Vass 8db141049f docker-py: upgrade and fix test script 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-28 12:56:50 -04:00
Jess Frazelle 96a6e810de Merge pull request #17418 from diogomonica/bump-go-1.5 
Bump go 1.5
 2015-10-27 20:12:43 -07:00
Brian Goff b78ca243d9 Revert "dockerversion placeholder for library-import" 
This reverts commit d5cd032a86.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-27 21:23:53 -04:00
Qiang Huang a41917c2c8 Bump bolt to v1.1.0 
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-10-28 08:49:45 +08:00
Samuel Karp 70083e6fc3 Update vendored aws-sdk-go 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-10-27 23:43:51 +00:00
Jessica Frazelle 9bcbb39fa8
update to binaries, fix parsers package, non-parallel test unit 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-27 14:43:25 -07:00
David Calavera 6276c676a8 Merge pull request #17350 from vdemeester/11699-auto-libraryimport 
dockerversion placeholder for library-import
 2015-10-27 13:39:40 -07:00
Vincent Demeester d5cd032a86 dockerversion placeholder for library-import 
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-27 20:36:07 +01:00
David Calavera 91de5ddf18 Merge pull request #17381 from mavenugo/rc3v1 
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
 2015-10-26 17:06:01 -07:00
David Calavera fe1e04a84f Merge pull request #17285 from Microsoft/10662-exectp4workaround 
Windows [TP4] Trap Hyper-V exec failure
 2015-10-26 16:47:51 -07:00
Sebastiaan van Stijn 9312a738d8 Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install 
apparmor check version on deb install
 2015-10-26 22:44:11 +01:00
Madhu Venugopal 139d1e13e2 Vendoring in libnetwork with fixes for issues identified in RC1 & RC2 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-26 13:56:56 -07:00
Santhosh Manohar 1041f39670 Vendor in libnetwork changes to support container rename 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2015-10-23 16:27:03 -07:00
John Howard a3c43964cf Windows [TP4] HCSShim Revendor 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-23 08:41:30 -07:00
Madhu Venugopal 793b20ba09 Vendoring in libkv to be aligned with libnetwork 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-22 14:12:46 -07:00
Madhu Venugopal 52df87ac2b Vendoring in Libnetwork 
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-22 14:12:46 -07:00
David Calavera 2afdc6582b Merge pull request #17274 from aboch/ai 
Turn off discovery when icc == false
 2015-10-22 13:08:31 -07:00
Jess Frazelle af6743a6c6 Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest 
RPM change install location of Fish completions
 2015-10-21 14:36:50 -07:00
Jess Frazelle 08fb495975 Merge pull request #17145 from thaJeztah/deb-add-fish-completions 
deb: add fish completions
 2015-10-21 13:58:22 -07:00
Tibor Vass 420e07cc2c release: fix bash bug in script 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-21 16:02:14 -04:00
Alessandro Boch 1be540b99b Vendoring in libnetwork for the anonymous endpoint 
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-10-21 09:32:48 -07:00
Tibor Vass bb5551746b Merge pull request #17229 from mavenugo/ds_fix 
Fixing bootup inconsistencies due to invalid cluster-store config
 2015-10-21 12:00:07 -04:00
Madhu Venugopal 2de2192c27 Vendoring in libnetwork to fix daemon bootup instabilities 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-20 19:56:59 -07:00
David Lawrence 43ba8a0426 some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-10-20 13:22:06 -07:00
David Calavera a7868191d4 Merge pull request #17188 from jfrazelle/fix-release-rpm 
fix copy of multiple rpms
 2015-10-20 11:31:35 -07:00
Jana Radhakrishnan 9750dd0088 Vendoring libnetwork 
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052

Has bug fixes for 1.9

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-10-19 21:29:26 -07:00
Jessica Frazelle 14e85c8c55
add test script for built debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:15:27 -07:00
Jessica Frazelle 8369f00d30
add generate aa profile to deb install 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:15:25 -07:00
Jessica Frazelle f549b1c9ea
fix copy of multiple rpms 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-19 16:14:06 -07:00
Sebastiaan van Stijn 6b1a643ac8 deb: add fish completions 
This adds the Fish completions to the .deb package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-10-17 23:28:11 -07:00
Sebastiaan van Stijn fb372e66bb RPM change install location of Fish completions 
External completions for fish should be installed
in /usr/local/share/fish/vendor_completions.d to
not conflict with built-in completions.

for reference, see:
https://github.com/fish-shell/fish-shell/issues/1485

fixes #16668

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-10-17 22:58:09 -07:00
Sebastiaan van Stijn cffd50752c Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build 
Vendoring new go-check checkers and use checker for docker_api_build_test.go
 2015-10-17 08:50:51 -07:00
Vincent Demeester 9685b4767f Vendoring shakers library and update go-check 
The shakers library defines a bunch of go-check checkers to ease
writing tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-17 14:28:08 +02:00
Sebastiaan van Stijn e3fabf3ea1 Merge pull request #16831 from jfrazelle/release-updates 
Release updates
 2015-10-16 16:57:10 -07:00
Tibor Vass 365a0db0f0 Merge pull request #17046 from mavenugo/dopts 
driver-opts for network create
 2015-10-16 15:23:59 -07:00
David Calavera 3668be932e Merge pull request #16574 from Djelibeybi/rpm-changelog 
Generate a full RPM changelog from the existing CHANGELOG.md file
 2015-10-16 14:55:39 -07:00
Madhu Venugopal cf1b5fe601 Vendoring libnetwork to Replace the label variable to DriverOpts 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-16 14:30:57 -07:00
David Lawrence 7ce9f02751 updating notary and gotuf with latest bugfixes 
Signed-off-by: David Lawrence <david.lawrence@docker.com>
 2015-10-16 09:33:26 -07:00
David Calavera e1804098b9 Merge pull request #16997 from Microsoft/10662-kill-parttwo 
Windows: [TP4] docker kill handling part two
 2015-10-15 14:42:19 -07:00
Jess Frazelle b22f89cb77 Merge pull request #16221 from flavio/get-docker-update-suse-installation 
Update SUSE/openSUSE installation script
 2015-10-14 13:02:45 -07:00
Flavio Castelli 400ac8a66c Update SUSE/openSUSE installation script 
Fix installation on SUSE Linux Enterprise machine, the updated Docker RPMs have
been moved to a different location.

Update both openSUSE and SUSE Linux Enterprise scripts to allow the
installation of experimental builds.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
 2015-10-14 20:55:28 +02:00
Michael Crosby 3ad9cc996a Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9 
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
 2015-10-13 16:56:19 -07:00
John Howard bc503ca8ab Windows: [TP4] docker kill handling 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-10-13 16:04:49 -07:00
Tibor Vass 9c94dcea3d Merge pull request #16863 from dhiltgen/bump_libkv 
Bump to latest libkv + dependencies
 2015-10-13 15:57:42 -07:00
Tibor Vass a17e53038d Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-10-13 15:48:13 -07:00
Jessica Frazelle 3057f0f0a7 update release-deb from the reprepro stuff we don't use 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-13 15:42:39 -07:00
Daniel Hiltgen 7078e7ddf4 Bump to latest libkv/libnetwork + dependencies 
The latest libkv uses a different etcd library.  Unfortunately
that library uses some funky import paths, so I've added a new cleanup
routine for our vendor scripts to be able to normalize the imports
to be consistent with how imports work in this tree.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2015-10-13 14:41:43 -07:00
Alexandre Beslic 4ea3ff7061 Merge pull request #16910 from mavenugo/ipam 
Vendoring libnetwork for the pluggable IPAM driver support
 2015-10-13 14:41:19 -07:00
Madhu Venugopal 2e3113aeef Vendoring in libnetwork ipam support 
* Pluggable IPAM driver support
* Performance and Scalability enhancements
* Libkv fixes in multiple backend stores

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-13 10:52:49 -07:00
Sven Dowideit 4e899d64e0 Missing a single dash in error message 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-10-11 22:46:14 -07:00
Arnaud Porterie ed9434c5bb Merge pull request #12648 from estesp/userns-impl 
Phase 1 implementation of user namespaces as a remapped container root
 2015-10-10 11:38:07 -07:00
Sebastiaan van Stijn a6bbf16aa1 Merge pull request #16895 from vdemeester/ocd-validate-typo 
Fix few comments in validate scripts
 2015-10-10 12:08:37 +02:00
Vincent Demeester 1ce9be346b Fix few comments in validate scripts 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-10 11:21:04 +02:00
Jessica Frazelle 930b27a86b fix logic because jess is the worst 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-09 22:21:24 -04:00
Phil Estes a85e6a4d4a Update integration test userns support with flag name change 
`--root` is now `--userns-remap`

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-10-09 20:52:45 -04:00
Jessica Frazelle ea3afdad61 add test-integration-cli specifics for userns 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-09 20:50:27 -04:00
Alexander Morozov 90e733f0b1 Merge pull request #16867 from dmcgowan/distribution-upstream-name-change 
Update distribution package for name regexp change
 2015-10-09 10:09:23 -07:00
Derek McGowan b5b0da5fec Update distribution package 
Pick up name regexp change in distribution to allow matching of hostnames as a valid component of a repository.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-10-08 17:16:43 -07:00
Brian Goff d9f5f1954c Bump runc 
Fixes a race when starting a container when there is an error, the stdio
streams are not always written.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-10-08 17:07:00 -04:00
Jessica Frazelle 96559aaef2
add clean apt db to release script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-08 09:21:20 -07:00
Jessica Frazelle 0aee0b1f9e
add script to generate index listing for the repo if say hosted on s3 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-08 09:21:16 -07:00
Antonio Murdaca 7539013436 bump libcontainer to 902c012e85cdae6bb68d8c7a0df69a42f818ce96 
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
 2015-10-06 17:55:09 +02:00
Arnaud Porterie 33e9d70c82 Merge pull request #16718 from mavenugo/discovery 
Vendoring libnetwork integrated with Docker discovery service
 2015-10-05 12:06:36 -07:00
Tianon Gravi 0339ed787c Merge pull request #16747 from vdemeester/docs-testdirs 
Update test-and-docs with TESTDIRS
 2015-10-05 10:39:56 -07:00
Vincent Demeester fbd0cea90c Remove use of testify mock and testify vendored lib 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-05 08:43:34 +02:00
Vincent Demeester 0542939f40 Update test-and-docs with TESTDIRS 
… and fix the rendering of `make test-unit` with TESTDIRS :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-10-04 21:19:04 +02:00
Madhu Venugopal 956fbccdaa Vendoring in libnetwork integrated with Docker Discovery 
This commit brings in end to end integration of Docker Discovery with
libnetwork multi-host networking.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-02 13:07:44 -07:00
Jessica Frazelle cb0ce5bb76
fix release script gpg key id 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-10-01 13:22:33 -07:00
Phil Estes b7a009cc1c Update runc to fba07bce72e72ce5b2dd618e4f67dd86ccb49c82 
Fixing user namespaces (again) with a vendor update from runc
(specifically, the remount() only if special flags change)

Other changes are very minimal.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-09-30 15:33:23 -04:00
Srini Brahmaroutu 81c42d6c1e Vendor in stretchr/testify to fix GCCGO issue with function name parsing 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-09-29 19:20:03 +00:00
Andrea Luzzardi 9324b154d2 Merge pull request #16229 from icecrime/discovery 
Add builtin nodes discovery
 2015-09-27 18:06:27 -07:00
Srini Brahmaroutu ba4c132491 Vendoring in libnetwork with the fix for compilation error using GCCGo (X86 GCCGO CI) 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-09-26 01:37:56 +00:00
Dan Levy 9728269424 Try me now, no `linuxmint` mentions needed 
Signed-off-by: Dan Levy <dan@danlevy.net>
 2015-09-25 19:07:59 -06:00
Tibor Vass c32d22e6e4 Merge pull request #16531 from vbatts/vbatts-non-utf8-name-fix 
vendor: update tar-split to v0.9.10
 2015-09-25 17:55:11 -04:00
Arnaud Porterie 7d193ef1f3 Add builtin nodes discovery 
Use `pkg/discovery` to provide nodes discovery between daemon instances.

The functionality is driven by two different command-line flags: the
experimental `--cluster-store` (previously `--kv-store`) and
`--cluster-advertise`. It can be used in two ways by interested
components:

1. Externally by calling the `/info` API and examining the cluster store
   field. The `pkg/discovery` package can then be used to hit the same
   endpoint and watch for appearing or disappearing nodes. That is the
   method that will for example be used by Swarm.
2. Internally by using the `Daemon.discoveryWatcher` instance. That is
   the method that will for example be used by libnetwork.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-09-25 14:52:09 -07:00
Arnaud Porterie 166e082be3 Add `pkg/discovery` for nodes discovery 
Absorb Swarm's discovery package in order to provide a common node
discovery mechanism to be used by both Swarm and networking code.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-09-25 13:33:23 -07:00
Jess Frazelle 3c3d232e0a Merge pull request #16589 from mavenugo/ln_vin_ls 
Vendoring libnetwork and libkv
 2015-09-25 13:31:14 -07:00
Vincent Batts ecedb3d81d vendor: update tar-split to v0.9.10 
This addresses handling of non-utf8 file names, namely iso-8859-1.

https://github.com/docker/docker/issues/16516

Reported-by: @kwk
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-09-25 14:42:17 -04:00
Jess Frazelle 80e31df3b6 Merge pull request #15916 from mikedougherty/release-flexibility 
Improve flexibility of release scripts
 2015-09-25 11:26:18 -07:00
Madhu Venugopal 59a000ec7f Vendoring libnetwork and libkv 
- Libnetwork brings in :
  * Default Gateway as a service for network drivers
  * Persistence for local scoped networks using libkv
  * BATS based Multi-host Integration-test infra and end-to-end tests
  * libnetwork fixes for zookeeper and etcd backend
- Libkv upgrade brings in :
  * boltdb support for local kv persistence
  * other general bug fixes

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-09-25 10:02:31 -07:00
Avi Miller 63e5891e4f Add documentation files including the LICENSE and CHANGELOG.md to the RPM 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2015-09-25 17:44:11 +10:00
Avi Miller 1374ebcde0 Generate a full RPM changelog from the existing CHANGELOG.md file 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2015-09-25 17:25:00 +10:00
Michael Crosby 189d2c7985 Update libcontainer to aac9179bbadbf958054ce97ab36 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-09-24 15:00:31 -07:00
Michael Crosby 6bd3e6357c Bump libcontainer to 08b5415ffa3769ff7c1d2f673f613 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-09-24 15:00:30 -07:00
David Calavera b0dc11127e Merge pull request #16328 from jfrazelle/opensuse-rpms 
add opensuse to rpm builder
 2015-09-22 15:59:49 -07:00
Tom Denham 499ade0116 Vendoring libnetwork 
Pull in version e5fea92a6c8a5968bdb8005bf959c6e23113b689

Fixes libnetwork regressions that stopped drivers that set routes from working.
Pulls in libnetwork PRs #546 #543

Signed-off-by: Tom Denham <tom@tomdee.co.uk>
 2015-09-21 11:13:14 -07:00
WANG Chao b51918fba1 Preserve /etc/sysconfig/docker across rpm update 
Otherwise we have to reconfigure every time docker rpm got update.

Signed-off-by: WANG Chao <wcwxyz@gmail.com>
 2015-09-17 12:12:28 +08:00
David Calavera 9ab8c2d92e Merge pull request #16358 from mrjana/mh 
Vendoring libnetwork
 2015-09-16 15:47:47 -07:00
Arnaud Porterie 0ac28f5e48 Merge pull request #16294 from jfrazelle/cleanup-vendor 
cleanup vendoring of test deps
 2015-09-16 15:45:36 -07:00
Jana Radhakrishnan a803148bba Vendoring libnetwork 
To fix an issue with experimental multihost networking.
git hash: 00a92f066e628e4c6d50979c070df377575aad18

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-09-16 14:48:42 -07:00
David Calavera 4a2c3733bd Merge pull request #16351 from mavenugo/vin_ln_kv 
Vendoring in libnetwork and libkv
 2015-09-16 14:10:49 -07:00
Jess Frazelle 74a8f2f668 Merge pull request #15861 from brahmaroutu/gccgo_x86 
Enable building Docker with gcc-go on x86
 2015-09-16 13:29:02 -07:00
Srini Brahmaroutu 2c53643b33 adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler. 
temporarily disabling registry builds as crypto package is broken with gccgo.

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-09-16 18:56:01 +00:00
Madhu Venugopal 814c19591d Vendoring in libnetwork and libkv 
* libkv upgrade is required for the docker discovery PR
* vendor-in libnetwork contains an update to network plugin api
  (Thanks @WeiZhang555 : https://github.com/docker/libnetwork/pull/516)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-09-16 11:54:28 -07:00
Jessica Frazelle 50d7fba775
Revert "Make daemon to start with no userlandproxy by default" 
This reverts commit bf2b8ec816.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-16 09:56:38 -07:00
Jessica Frazelle b0d4e9d1ba
add opensuse to rpm builder 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-15 16:18:19 -07:00
Jessica Frazelle 8ef7aaf885
cleanup vendoring of test deps 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-14 17:38:50 -07:00
Madhu Venugopal d0e0c13b60 Vendor-in 2baa2ddc78b42f011f55633282ac63a72e1b09c1 for userns support 
Changes include :
* libnetwork support for userns
* driver api change to have 1 interface per endpoint

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-09-14 11:04:12 -07:00
Phil Estes dac92a8afb Merge pull request #16244 from calavera/libcontainer_0_0_4 
Vendor libcontainer v0.0.4
 2015-09-13 22:24:44 -04:00
Nalin Dahyabhai e611a189cb Add log reading to the journald log driver 
If a logdriver doesn't register a callback function to validate log
options, it won't be usable.  Fix the journald driver by adding a dummy
validator.

Teach the client and the daemon's "logs" logic that the server can also
supply "logs" data via the "journald" driver.  Update documentation and
tests that depend on error messages.

Add support for reading log data from the systemd journal to the
journald log driver.  The internal logic uses a goroutine to scan the
journal for matching entries after any specified cutoff time, formats
the messages from those entries as JSONLog messages, and stuffs the
results down a pipe whose reading end we hand back to the caller.

If we are missing any of the 'linux', 'cgo', or 'journald' build tags,
however, we don't implement a reader, so the 'logs' endpoint will still
return an error.

Make the necessary changes to the build setup to ensure that support for
reading container logs from the systemd journal is built.

Rename the Jmap member of the journald logdriver's struct to "vars" to
make it non-public, and to make it easier to tell that it's just there
to hold additional variable values that we want journald to record along
with log data that we're sending to it.

In the client, don't assume that we know which logdrivers the server
implements, and remove the check that looks at the server.  It's
redundant because the server already knows, and the check also makes
using older clients with newer servers (which may have new logdrivers in
them) unnecessarily hard.

When we try to "logs" and have to report that the container's logdriver
doesn't support reading, send the error message through the
might-be-a-multiplexer so that clients which are expecting multiplexed
data will be able to properly display the error, instead of tripping
over the data and printing a less helpful "Unrecognized input header"
error.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
 2015-09-11 16:50:03 -04:00
David Calavera 6f15546f6b Merge pull request #16231 from jfrazelle/vendor-test-deps 
allow vendoring of test packages
 2015-09-11 13:47:03 -07:00
David Calavera 55a601e3f1 Vendor libcontainer v0.0.4 
Noteworthy changes:

- Add Prestart/Poststop hook support
- Fix bug finding cgroup mount directory
- Add OomScoreAdj as a container configuration option
- Ensure the cleanup jobs in the deferrer are executed on error
- Don't make modifications to /dev when it is bind mounted

Other changes in runc:

https://github.com/opencontainers/runc/compare/v0.0.3...v0.0.4

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-09-11 16:17:59 -04:00
Jana Radhakrishnan bf2b8ec816 Make daemon to start with no userlandproxy by default 
This PR makes a user visible behavior change with userland
proxy disabled by default and rely on hairpin NAT to be enabled
by default. This may not work in older (unsupported) kernels
where the user will be forced to enable userlandproxy if needed.

      - Updated the Docs
      - Changed the integration-cli to start with userlandproxy
	desiabled by default.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-09-11 11:58:35 -07:00
Jessica Frazelle 1ca88b2ca6 allow vendoring of test packages 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-10 19:21:46 -07:00
Jessica Frazelle b18d664692 do not allow the release of a dirty binary 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-10 12:28:09 -07:00
David Calavera 9f517fc5bb Merge pull request #15495 from samuelkarp/awslogs-logging-driver 
Add awslogs driver for Amazon CloudWatch Logs
 2015-09-09 17:19:39 -07:00
David Calavera 72f355e466 Merge pull request #16192 from anusha-ragunathan/dev 
Updated rpm spec to perform cleaner installs
 2015-09-09 15:26:36 -07:00
Anusha Ragunathan 1caa9a7d16 Updated rpm spec to perform cleaner installs 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2015-09-09 17:13:57 -04:00
Samuel Karp 85433365cc Vendor AWS Go SDK 
Signed-off-by: Samuel Karp <skarp@amazon.com>
 2015-09-09 13:51:14 -07:00
Jess Frazelle 0072896445 Merge pull request #16171 from vdemeester/lint-only-on-diff 
Golint only on changed files
 2015-09-09 10:19:16 -07:00
Jess Frazelle 3d8aae1308 Merge pull request #16149 from LK4D4/remove_link_libs 
Remove -lpthread and -ldl from ldflags
 2015-09-09 10:13:36 -07:00
Vincent Demeester 1cca5ee98c Golint only on changed files 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-09 09:37:47 +02:00
Alexander Morozov 8845eb4345 Remove -lpthread and -ldl from ldflags 
There is no need in those flags now when we use amalgamated sqlite3 from
mattn/go-sqlite3.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-09-08 17:01:14 -07:00
Jess Frazelle 634a848b8e Merge pull request #16096 from vdemeester/14756-final-golints 
Final bits of enabling golint on the code base 🐹
 2015-09-08 15:25:55 -07:00
Vincent Demeester 0c70eb8381 Update validate-lint to find go files by itself 
… and fixes the last bits that were missing :3.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-08 22:07:42 +02:00
David Calavera 479fcbb1d0 Merge pull request #16088 from jfrazelle/better-canonical-json-package 
replace canonical json package
 2015-09-08 11:58:24 -07:00
Madhu Venugopal eb5c81e799 Merge pull request #16130 from aboch/vnd 
Vendoring libnetwork 3e31cead05cba8ec20241630d051e6d73765b3a2
 2015-09-08 11:29:34 -07:00
Alessandro Boch 4d648f924a Vendoring libnetwork 3e31cead05cba8ec20241630d051e6d73765b3a2 
+ Fix a couple of bugs introduced by previous vendoring:
  - in bitseq which prevents to use experimental overlay networking
  - in docker service ls cli o/p
+ Add missing http subrouter for newly introduced sandboxes
+ Fix fragmentation issue on vxlan header addition for overlay network driver
+ Remove libnetwork test code utilities from vendoring

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-09-08 07:36:35 -07:00
Jessica Frazelle c045af8332 replace weird canonical json package with one that is rebased on the standard encoding/json package 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-07 18:51:33 -07:00
Jessica Frazelle 46df9e4ec3 update sqlite3 vendor with fix for static builds 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-07 18:50:56 -07:00
Kir Kolyshkin 15aad5d3e6 make binary: do not ignore unresolved symbols 
TL;DR: stop building static binary that may fail

Linker flag --unresolved-symbols=ignore-in-shared-libs was added
in commit 06d0843 two years ago for the static build case, presumably
to avoid dealing with problem of missing libraries.

For the record, this is what ld(1) man page says:

> --unresolved-symbols=method
>    Determine how to handle unresolved symbols.  There are four
>    possible values for method:
> .........
>    ignore-in-shared-libs
>        Report unresolved symbols that come from regular object files,
>        but ignore them if they come from shared libraries.  This can
>        be useful when creating a dynamic binary and it is known that
>        all the shared libraries that it should be referencing are
>        included on the linker's command line.

Here, the flag is not used for its purpose ("creating a dynamic binary")
and does more harm than good. Instead of complaining about missing symbols
as it should do if some libraries are missing from LIBS/LDFLAGS, it lets
ld create a binary with unresolved symbols, ike this:

 $ readelf -s bundles/1.7.1/binary/docker-1.7.1 | grep -w UND
 ........
 21029: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND dlopen
 .........

Such binary is working just fine -- until code calls one of those
functions, then it crashes (for apparently no reason, i.e. it is
impossible to tell why from the diagnistics printed).

In other words, adding this flag allows to build a static binary
with missing libraries, hiding the problem from both a developer
(who forgot to add a library to #cgo: LDFLAGS -- I was one such
developer a few days ago when I was working on ploop graphdriver)
and from a user (who expects the binary to work without crashing,
and it does that until the code calls a function in one of those
libraries).

Removing the flag immediately unveils the problem (as it should):

	/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu/libsqlite3.a(sqlite3.o):
	In function `unixDlError':
	(.text+0x20971): undefined reference to `dlerror'
	/usr/lib/gcc/x86_64-linux-gnu/4.8/../../../x86_64-linux-gnu/libsqlite3.a(sqlite3.o):
	In function `unixDlClose':
	(.text+0x8814): undefined reference to `dlclose'

The problem is, gosqlite package says:

	#cgo LDFLAGS: -lsqlite3

which is enough for dynamic linking, as indirect dependencies (i.e.
libraries required by libsqlite3.so) are listed in .so file and will be
resolved dynamically by ldd upon executing the binary.

For static linking though, one has to list all the required libraries,
both direct and indirect. For libraries with pkgconfig support the
list of required libraries can be obtained with pkg-config:

	$ pkg-config --libs sqlite3 # dynamic linking case
	-lsqlite3
	$ pkg-config --libs --static sqlite3 # static case
	-lsqlite3 -ldl -lpthread

It seems that all one has to do is to fix gosqlite this way:

	-#cgo LDFLAGS: -lsqlite3
	+#cgo pkg-config: sqlite3

Unfortunately, cmd/go doesn't know that it needs to pass --static
flag to pkg-config in case of static linking
(see https://github.com/golang/go/issues/12058).

So, for one, one has to do one of these things:

1. Patch sqlite.go like this:

	-#cgo LDFLAGS: -lsqlite3
	+#cgo pkg-config: --static sqlite3

(this is exactly what I do in goploop, see
https://github.com/kolyshkin/goploop/commit/e9aa072f51)

2. Patch sqlite.go like this:
	-#cgo LDFLAGS: -lsqlite3
	+#cgo LDFLAGS: -lsqlite3 -ldl -lpthread

(I would submit this patch to gosqlite but it seems that
https://code.google.com/p/gosqlite/ is deserted and not maintained,
and patching it here is not right as it is "vendored")

3. Explicitly add -ldl for the static link case.
This is what this patch does.

4. Fork sqlite to github and maintain it there. Personally I am not
ready for that, as I'm neither a Go expert nor gosqlite user.

Now, #3 doesn't look like a clear solution, but nevertheless it makes
the build much better than it was before.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2015-09-04 13:15:25 -07:00
Jessie Frazelle 38ecc7fc32 Merge pull request #16054 from jfrazelle/update-sqlite3-dep 
code.google.com is shutting down so update the dep
 2015-09-03 19:20:57 -07:00
Jessie Frazelle 90477e8e94 Merge pull request #16066 from jfrazelle/remove-reprepro 
remove reprepro
 2015-09-03 18:20:01 -07:00
Jessie Frazelle 1fa560e6eb Merge pull request #15706 from clnperez/vendor-helper-use-branch 
Allow branch name in vendor-helper script
 2015-09-03 18:02:06 -07:00
Tianon Gravi b019229996 Merge pull request #16052 from jfrazelle/fix-release-selinux 
make docker-engine-selinux findable
 2015-09-03 17:52:39 -07:00
Jessica Frazelle 4a864a7552 code.google.com is shutting down so update the dep 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-03 17:39:29 -07:00
Jessica Frazelle e7cf75c103 remove reprepro 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-03 17:31:49 -07:00
Tibor Vass 07d2eae6d5 Merge pull request #16060 from vdemeester/14756-lint-pkg-term-windows 
Lint pkg/term/windows package
 2015-09-03 19:54:20 -04:00
Vincent Demeester 3409de971c Lint pkg/term/windows package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-03 22:25:52 +02:00
Michael Crosby 288275ab60 Merge pull request #16038 from aboch/sbx 
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
 2015-09-03 11:48:02 -07:00
Jessica Frazelle c7b3e7e770 make docker-engine-selinux findable 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-03 08:58:33 -07:00
Alessandro Boch 414dfbf681 Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639 
Main changes in this vendoring are to allow user name space integration in docker.
And it includes major fix for network namespace handling

Signed-off-by: Alessandro Boch <aboch@docker.com>

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-09-02 16:57:43 -07:00
Jessica Frazelle 12a71c8954 use apt-ftparchive and reprepro to enable apt-pinning; 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-02 09:32:24 -07:00
Mike Dougherty 7ca017eb62 Add ability to use a different GPG key identifier 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2015-08-31 11:27:57 -07:00
Jessica Frazelle 80c32162b5 we dont need the tty in the install script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-31 08:12:01 -07:00
David Calavera 998699316c Merge pull request #15901 from Microsoft/10662-revendorhcs 
Windows: Revendor HCSShim with godoc
 2015-08-31 10:03:18 +02:00
David Calavera 9703c3a90e Merge pull request #15914 from dmcgowan/fix-upload-sanitize 
Fix sanitize URL bug on layer upload
 2015-08-31 09:35:28 +02:00
Jessica Frazelle 8fe675d799 add selinux-policy and docker-engine-selinux rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-28 17:54:04 -07:00
Jessica Frazelle df6d928370 update spec file to require docker-engine-selinux policy 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-28 17:43:30 -07:00
Derek McGowan b1c1f42bcc Fix sanitize URL bug on layer upload 
Update the distribution version to include sanitize URL fix

Fixes #15875

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-08-28 14:35:06 -07:00
David Calavera 433956cc47 Merge pull request #15310 from MHBauer/demon-lint-squash 
golint fixes for daemon/ package
 2015-08-28 17:34:36 +02:00
Morgan Bauer abd72d4008
golint fixes for daemon/ package 
- some method names were changed to have a 'Locking' suffix, as the
 downcased versions already existed, and the existing functions simply
 had locks around the already downcased version.
 - deleting unused functions
 - package comment
 - magic numbers replaced by golang constants
 - comments all over

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-08-27 22:07:42 -07:00
Mike Dougherty b46c15e772 Add support for longer S3 bucket paths 
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
 2015-08-27 18:32:03 -07:00
John Howard 5a5f9e93e9 Windows: Revendor HCSShim with godoc 
Signed-off-by: John Howard <John.Howard@microsoft.com>
 2015-08-27 15:46:00 -07:00
Vincent Demeester 0bd016b1c3 Finish linting opts and trust package. 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-27 17:36:11 +02:00
Srini Brahmaroutu eecf6cd48c Allow vendoring netns change to build Docker on s390x 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-25 15:07:17 +00:00
Tianon Gravi b8bed8832b Update dind "/tmp" mounting to be optional 
This allows someone running the image to use `-v` to mount a non-tmpfs `/tmp` into their image if they so require/desire.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-08-21 15:47:50 -07:00
Jessie Frazelle e5e6eaacee Merge pull request #15492 from vbatts/update-tar-split 
vendor: update tar-split to v0.9.6
 2015-08-21 14:45:19 -07:00
Jessie Frazelle ecff4badcd Merge pull request #15125 from WeiZhang555/golint-stdcopy-system 
fix golint warnings/errors on pkg/system and pkg/stdcopy
 2015-08-21 14:27:59 -07:00
Jessie Frazelle 9d22c7a2d5 Merge pull request #15596 from jfrazelle/hack-dind-its-been-fun 
docker 1.8+ no longer needs dind
 2015-08-21 13:51:41 -07:00
Jessica Frazelle c48ac77840 update hack/dind for 1.8 mounting of cgroups 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-21 11:13:33 -07:00
Christy Perez 6bf2440650 Allow branch name in vendor-helper script 
With this, you can specify a branch name in the
vendor script instead of a commit ID. This makes it easier
to quickly test changes in dep'd repos outside of the DIND
environment.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2015-08-19 17:56:04 -05:00
Srini Brahmaroutu 9e1a41aae5 daemon/graphdriver fix lint errors/warnings 
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-17 19:27:36 +00:00
David Calavera 2e7b088164 Merge pull request #15579 from Microsoft/10662-graph 
Windows: Graph remove custom interface, add central store
 2015-08-17 10:45:48 -07:00
Stefan J. Wernli dfbb5520e3 Windows: Graph remove custom interface and add central store 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>

Windows: add support for images stored in alternate location.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2015-08-14 23:45:53 -07:00
Jana Radhakrishnan 7948b755c7 Vendoring in vishvananda/netlink 
Updating netlink package to 4b5dce31de6d42af5bb9811c6d265472199e0fec
to fix certain wierd netlink issues seen.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-08-14 18:02:58 -07:00
Madhu Venugopal 703e2264ba Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3 
Notable changes include :
- #285 : Fix required for https://github.com/docker/docker/pull/12927
- #283 : Code re-architecture/tech-debt in bridge driver
- Upgraded to latest Netlink library
- Fixed certain race-conditions

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-08-14 05:57:47 -07:00
Arnaud Porterie 693ff58cd2 Merge pull request #14758 from Microsoft/10662-pipestohcs 
Windows: [TP3] new hcsshim stdin/out/err handling
 2015-08-13 22:52:48 -07:00
Jessie Frazelle 46d9fd6a11 Merge pull request #15367 from hqhq/hq_update_rpm_deb_desc 
Tiny fix for rpm and deb descriptions
 2015-08-13 15:04:50 -07:00
John Starks ec5a73d18e Windows: new hcsshim stdin/out/err handling 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-08-13 13:09:42 -07:00
Vincent Batts 4ce24eb73a vendor: update tar-split to v0.9.6 
Fixes rare edge case of handling GNU LongLink and LongName entries.
Perf improvements. /dev/null writes were taking CPU time during docker
push. Thanks @LK4D4
Various cleanup too.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-08-13 15:42:01 -04:00
Zhang Wei 7e420ad850 fix golint warnings/errors on `pkg/system` and `pkg/stdcopy` 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-08-13 18:47:13 +08:00
Jessie Frazelle e82358586d Merge pull request #15183 from jfrazelle/test-install-script 
add file to test install script
 2015-08-12 09:49:35 -07:00
Jessie Frazelle 13873e6841 Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs 
do not keep old debs for experimental
 2015-08-11 16:35:55 -07:00
Jessica Frazelle 0eade329dc fix oracle linux install 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-11 16:33:14 -07:00
Jessica Frazelle 83416f68de add file to test install script 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-11 16:31:58 -07:00
Jessica Frazelle 8bd6322760 minor cosmetic change to client output on pull 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-10 21:54:03 -07:00
Jessica Frazelle e62745922f make windows cross compile static daemon work 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-10 16:16:58 -07:00
Brian Goff 51249a3aa0 Merge pull request #15445 from hqhq/hq_use_docker_daemon 
Change all docker -d to docker daemon
 2015-08-10 10:35:19 -04:00
David Calavera ba0eba6960 Merge pull request #15426 from BenHall/15425-set-e-install-script-fix 
Fix install.sh to handle non-zero exit codes when checking lsb_release
 2015-08-10 08:47:19 -05:00
Qiang Huang 81cc8ebc93 Change all docker -d to docker daemon 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-10 20:48:08 +08:00
Qiang Huang ff97bc79cb Tiny fix for rpm and deb descriptions 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-10 09:34:10 +08:00
Brian Goff 764aa1a583 Merge pull request #15074 from coolljt0725/14756_enable_golint_2 
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
 2015-08-08 07:14:53 -04:00
Ben Hall 3b28bada0a Fix install.sh to handle non-zero exit codes when checking lsb_release 
Signed-off-by: Ben Hall <ben@benhall.me.uk>
 2015-08-08 11:44:52 +01:00
Lei Jitang 5220f3b535 Enable golint in pkg/jsonlog and pkg/jsonmessage. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-08 11:28:22 +08:00
Veres Lajos 5146232723 typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
 2015-08-07 23:25:49 +01:00
Alexander Morozov 7ac357c795 Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd 
Remove pkg/systemd from validate-lint
 2015-08-07 14:31:12 -07:00
Vincent Demeester b8559991dc Remove pkg/systemd from validate-lint 
Following #15330, pkg/systemd doesn't exists anymore.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-08-07 22:26:45 +02:00
Srini Brahmaroutu de3944219f daemon/graphdriver/overlay/ fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-07 18:34:59 +00:00
David Calavera 0a0e9701f7 Merge pull request #14897 from WeiZhang555/golint-api-types 
fix golint warnings/errors on package api/types/
 2015-08-07 10:51:27 -07:00
David Calavera b1009d1fdd Merge pull request #14828 from brahmaroutu/lint_graph_tags 
/graph/tag fix lint errors/warnings
 2015-08-07 10:49:26 -07:00
Arnaud Porterie 27fd64c67f Merge pull request #15392 from Microsoft/js/vendor_ansiterm 
Update vendored go-ansiterm for Windows console
 2015-08-07 09:01:31 -07:00
root ecf528fcb6 Update vendored go-ansiterm for Windows console 
This update fixes Windows client console bugs and increases VT100
compatibility. With this change, nano and emacs become usable, and bash
works better.

Signed-off-by: John Starks <jostarks@microsoft.com>
 2015-08-06 20:48:02 -07:00
Zhang Wei 3d6617ffe7 fix golint warnings/errors on package api/types/ 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-08-07 09:43:43 +08:00
Jessica Frazelle 203776a40c fix rpm signing so it does not open a tty w question 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-06 16:18:40 -07:00
Jessica Frazelle aadb3407d3 to not keep old debs for experimental 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-06 14:49:05 -07:00
Alessandro Boch e35a5ae463 Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-08-06 14:23:25 -07:00
Jessica Frazelle ed248207d7 revert apparmor changes back to how it was in 1.7.1, but keep tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-06 12:49:25 -07:00
Qiang Huang b8a8ac9b58 Use docker daemon for intergation test daemon start 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-06 16:20:57 +08:00
Tibor Vass 8534090476 Merge pull request #15252 from coolljt0725/14765_enable_golint_3 
Enable golint in pkg/archive
 2015-08-05 19:27:48 -04:00
Jessie Frazelle a8e67849b9 Merge pull request #15001 from fmoliveira/master 
Adding support for elementary OS distro in install script.
 2015-08-05 16:14:47 -07:00
John Howard ac120567e8 Windows: Workaround for CI 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-08-05 11:20:30 -07:00
Srini Brahmaroutu d9b261221a /graph/tag fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-05 17:46:41 +00:00
Arnaud Porterie 2c3cd949c8 Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs 
daemon/graphdriver/zfs fix lint errrors/warnings
 2015-08-04 18:41:02 -07:00
Arnaud Porterie 7b077c16d6 Merge pull request #15302 from LK4D4/update_libcontainer 
Update runc to v0.0.3
 2015-08-04 18:40:32 -07:00
Filipe Oliveira f618de1543 Adding support to forked distributions in installer script. 
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br>
 2015-08-04 21:33:48 -03:00
Jessica Frazelle efd47654dd only sign the files that were changed in the last 2 hours 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-04 13:16:57 -07:00
Antonio Murdaca 23dab01ed2 Merge pull request #14840 from HuKeping/golint-pkg-sysinfo 
Fix golint warning on pkg/sysinfo
 2015-08-04 20:57:39 +02:00
Srini Brahmaroutu e27c904b99 daemon/graphdriver/zfs fix lint errrors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-04 18:30:55 +00:00
Alexander Morozov a4ddf0e362 Update runc to v0.0.3 
This fixes criu behavior with mounted cgroups.
It includes also update of go-systemd dependecy.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-08-04 10:47:59 -07:00
Lei Jitang ba332b7d12 Enable golint in pkg/arcive 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-04 09:52:54 +08:00
David Calavera 408cffac94 Include apparmor/docker only when it exists. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-08-03 17:34:04 -07:00
Alessandro Boch dab0447ae0 Fix preallocated bridge networks 
- Because of a bug, all the statically preallocated
  bridge networks have /24 as network mask.

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-08-03 16:37:01 -07:00
Arnaud Porterie ff3adb135d Merge pull request #15114 from hqhq/hq_exedriver_win_lint 
Fix golint warnings for daemon/execdriver/windows
 2015-08-03 16:28:47 -07:00
Srini Brahmaroutu 3e7f9c636a daemon/graphdriver/vfs fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-08-03 17:46:42 +00:00
Arnaud Porterie 67bca8ab8a Merge pull request #15215 from dmcgowan/notary-update 
Notary updates
 2015-08-03 09:06:09 -07:00
Brian Goff dce1488ae5 Merge pull request #15013 from coolljt0725/14756_enbale_golint_1 
Enable golint, part of #14756
 2015-08-02 22:14:18 -04:00
Qiang Huang f9b5eb0cac Fix golint warnings for daemon/execdriver/windows 
Addresses: #14756

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-03 09:54:02 +08:00
Lei Jitang 27a8f9937e Enable golint part of #14756 
pkg/broadcastwriter
pkg/graphdb
pkg/httputils
pkg/ioutils

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-03 09:45:05 +08:00
Hu Keping 7390cc5300 Fix golint warning on pkg/sysinfo 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-08-01 18:24:49 +08:00
Derek McGowan d594c6fcd8 Vendor latest notary 
Use updated notary to pick up updates from security review

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-07-31 17:32:35 -07:00
David Calavera 9e9f3aa36b Merge pull request #15185 from aboch/vnd_lbn_1.8 
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
 2015-07-31 08:58:41 -07:00
Tibor Vass b48d744b07 Merge pull request #15175 from MHBauer/cliconfig-lint 
additional lint fix and enable linter for cliconfig package
 2015-07-30 23:07:19 -04:00
Tibor Vass 0cce1fb37f Vendor docker/distribution to 7dc8d4a26b 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-07-30 21:14:39 -04:00
Alessandro Boch 91274625ba Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-07-30 17:28:40 -07:00
Jessica Frazelle b0af811272 fix regression 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-07-30 16:38:51 -07:00
Jessie Frazelle 5b65284649 Merge pull request #15103 from Djelibeybi/fix14924 
Seperate lsb_dist detection from dist_version detection
 2015-07-30 16:21:35 -07:00
Morgan Bauer e809919e26
lint fix and enable linter for cliconfig package 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-07-30 14:37:37 -07:00
Tibor Vass 2f1a7c903f Merge pull request #14844 from WeiZhang555/golint-api 
fix golint errors/warnings of pkg api/
 2015-07-30 16:02:06 -04:00
root cfeab585c0 fix golint errors/warnings of pkg `api/` 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-07-30 09:46:25 +08:00
Qiang Huang e34f562a77 Add back golint for daemon/execdriver/native 
It's broken by #15099 Fix it.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-30 08:58:54 +08:00
Jessie Frazelle 2ae174e491 Merge pull request #15138 from ewindisch/apparmor-fix-test-plus-unconfined 
Fix the proc integration test & include missing AA profile
 2015-07-29 15:32:13 -07:00
Tibor Vass 6a274e48dc Merge pull request #14843 from MHBauer/demonlogger-lint 
golint fixes for daemon/logger/*
 2015-07-29 18:09:46 -04:00
Eric Windisch 0f4e5f7149 Remove container AA profile from packaging 
Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-07-29 17:47:38 -04:00
Avi Miller 5c6446f335 Fix for #14924. Seperates lsb_dist detection from dist_version detection 
so that the latter can be distro specific.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2015-07-30 07:30:51 +10:00
Srini Brahmaroutu 1d6e443119 /graph fix lin errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-29 20:59:36 +00:00
Morgan Bauer ccbe539e86
golint fixes for daemon/logger/* 
- downcase and privatize exported variables that were unused
 - make accurate an error message
 - added package comments
 - remove unused var ReadLogsNotSupported
 - enable linter
 - some spelling corrections

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-07-29 13:09:39 -07:00
Tibor Vass e77ea5aa7a Merge pull request #14784 from brahmaroutu/lint_api_client 
fix golint errors/warnings
 2015-07-29 14:04:45 -04:00
David Calavera 1cfae07a6e Merge pull request #15015 from runcom/14911-fix-install-script-debian81 
Fix install script to handle debian 8.1 apt repo string
 2015-07-29 10:45:50 -07:00
Tibor Vass dfcdde4d98 Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper 
daemon/graphdriver/devmapper/ fix lint errors/warnings
 2015-07-29 13:29:57 -04:00
root 929f2c2f40 api/client fix golint errors/warnings 
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-29 17:20:54 +00:00
Tibor Vass 2cd058ce4f Merge pull request #14785 from brahmaroutu/lint_api_server 
fix golint errors/warnings
 2015-07-29 13:09:31 -04:00
Jessica Frazelle c2c9e99d84 fix linnt 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-07-29 10:05:30 -07:00
Tibor Vass 0c330a7823 Merge pull request #15064 from jfrazelle/14590-fix-sudo 
sh -c the cat repo for yum
 2015-07-29 10:02:27 -04:00
Jessica Frazelle 93d134c61f sh -c the cat repo for yum 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-28 20:25:26 -07:00
Srini Brahmaroutu 972a94b449 daemon/graphdriver/devmapper/ fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-29 01:43:34 +00:00
Tibor Vass cc6138d946 Merge pull request #15063 from jfrazelle/only-write-distributions-file-if-dne 
only write distributions file if dne
 2015-07-28 20:45:04 -04:00
root 351f6b8ec0 api/server fix golint errors/warnings. 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-28 22:44:39 +00:00
Alexander Morozov f809037128 Merge pull request #14848 from hqhq/hq_golint_execdriver 
Fix golint warnings for daemon/execdriver/*
 2015-07-28 14:23:22 -07:00
Alexander Morozov 2c162292b7 Merge pull request #14824 from fcantournet/lint_pkg_mflag 
Fix golint for pkg/mflag
 2015-07-28 13:51:09 -07:00
Alexander Morozov 9cfc223cc0 Merge pull request #14818 from MHBauer/volume-lint 
lint for volume/*
 2015-07-28 13:42:18 -07:00
Jessie Frazelle e06df594f5 Merge pull request #14863 from brahmaroutu/lint_daemon_graphdriver_aufs 
daemon/graphdriver/aufs fix lint errors/warnings
 2015-07-28 11:46:40 -07:00
Morgan Bauer 9af963aba0
lint fixes for volume/* 
- comments on exported values
 - constant string replaced by constant reference
 - unexport implementation details of VolumeDriver 'local'
 - add fixed packages to linter list

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-07-28 10:40:44 -07:00
John Howard 663d50464e Windows: Fix vendor-helpers.sh 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-28 10:13:33 -07:00
Félix Cantournet 8e6ad2171a Fix golint for pkg/mflag 
Signed-off-by: Félix Cantournet <felix.cantournet@cloudwatt.com>
 2015-07-28 15:32:42 +02:00
Srini Brahmaroutu 55885daa56 daemon/graphdriver/aufs fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-28 06:17:05 +00:00
Qiang Huang 4862d723a4 Add daemon/execdriver/* to validate-lint 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-28 08:44:12 +08:00
Jessie Frazelle 33358f80e5 Merge pull request #14838 from Microsoft/10662-ansirewrite 
Windows: CLI Improvement (TP3)
 2015-07-27 17:30:14 -07:00
Jessie Frazelle f32cab874c Merge pull request #15034 from aaronlehmann/update-vendored-distribution 
Update vendored distribution repo to new version
 2015-07-27 17:24:35 -07:00