2de855c127
bash completion for docker volume
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 57ab4a1a6c0d2305ec273eb5ccdbf816144f839e
Component: engine
2015-09-07 13:22:57 -07:00
e0cf284e09
Merge pull request #16121 from albers/doc-volume-typo-1
...
Fix minor typo in volume create reference
Upstream-commit: 13d1f0c1a18a1addc46d8703967d8fbbd0339656
Component: engine
2015-09-07 15:33:40 -04:00
65a716fd85
Fix minor typo in docs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 45368779f86c2f0e78a6703bf64a0b149251b8b5
Component: engine
2015-09-07 21:16:47 +02:00
a525ed7c4d
Merge pull request #16120 from josegonzalez/patch-1
...
Transform comma into period
Upstream-commit: b1053a752667736aa41ee67a38f87ab9b7fe87ed
Component: engine
2015-09-07 14:05:03 -04:00
f5846f0768
Transform comma into period
...
This was probably meant as a separate sentence but is now
"proper english."
Signed-off-by: Jose Diaz-Gonzalez <jose@seatgeek.com >
Upstream-commit: be304ec688e080ae6fe4c58bcc7d0f662bb240dc
Component: engine
2015-09-07 13:56:20 -04:00
936e7392bc
Merge pull request #16110 from Mashimiao/daemon-create-fix-return-and-adjust
...
before adjusting should check whether need return or not
Upstream-commit: c1c4ccefcdbb3cf8eb00c10b21e3f0aabc005b2a
Component: engine
2015-09-07 09:16:23 -07:00
983ae0ad3d
Merge pull request #16111 from Mashimiao/fix-typo-daemon-daemon
...
daemon/daemon: fix typo
Upstream-commit: 6743a6e6658406a2d463b40e2e228bba08e5b16c
Component: engine
2015-09-07 09:31:54 +02:00
b9c2a00198
daemon/daemon: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 89f99343ff3df3cc5ac243a3a056f136885d012b
Component: engine
2015-09-07 14:43:22 +08:00
e97d8f4a03
before adjusting should check whether need return or not
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 73d8af9319cb3f6183d693a4abc0ef93dabf9b97
Component: engine
2015-09-07 11:09:39 +08:00
f9e03bc314
Merge pull request #16102 from HuKeping/rmdeadcode
...
Remove dead code
Upstream-commit: 7ce97dbe306365203ac3c094ad862353a2b1b338
Component: engine
2015-09-06 08:40:45 -04:00
2b2fcd8cea
Remove dead code
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: c957d9c768a3c2e56b31db09399b49b8dc66c3c1
Component: engine
2015-09-06 19:52:39 +08:00
22b92a13e4
Merge pull request #16091 from sallyom/man-docker-pull
...
correct man docker-pull
Upstream-commit: 8562c423b8afa5c41c5b8f25880c644d14085bc7
Component: engine
2015-09-05 14:14:11 +02:00
21a5e4f86b
Merge pull request #16082 from sallyom/manDocker
...
add --insecure-registry warning to online docs
Upstream-commit: e4f721e73e8da22f74374f696d432f0d4ef2d17b
Component: engine
2015-09-05 22:06:45 +10:00
c966a91e81
Merge pull request #15992 from Microsoft/10662-cli
...
Windows: Get Integration CLI running
Upstream-commit: 835acd96ecb653cbcb3731d8c18e5ff126888384
Component: engine
2015-09-04 13:38:41 -07:00
a0777d04f5
correct man docker-pull
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 73fe42e3db040787761691a930fce7bf322febe6
Component: engine
2015-09-04 16:34:40 -04:00
c03ccb6893
Windows: Get Integration CLI running
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f9a3558a9d75ed6a2f9f1b2d80800226afaa74a5
Component: engine
2015-09-04 12:32:40 -07:00
1e8976f982
Merge pull request #16087 from Microsoft/turn-off-dockerhubpull-suite
...
Temp: Turn off dockerhubpullsuite on Win2Linux CI
Upstream-commit: bc915d0856edc10baf9c884bb2abbedadf51a573
Component: engine
2015-09-04 12:30:06 -07:00
cd76a76b2f
Temp: Turn off dockerhubpullsuite on Win2Linux CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0b18b1b3095ec8a937e76e02b9f0805972cff734
Component: engine
2015-09-04 11:53:40 -07:00
4792ea30e7
Merge pull request #16065 from Microsoft/10662-fix2panics
...
Fixes 2 panics initialising tests
Upstream-commit: 6b14d9a64576197901c9a498caef3cc6f7f3bc43
Component: engine
2015-09-04 11:07:17 -07:00
4ec4a9a12d
Merge pull request #16039 from icecrime/update_pull_tests
...
Update pull tests
Upstream-commit: 5b46d8f0fa2a687f748d65697bc094e69d039455
Component: engine
2015-09-04 09:52:41 -07:00
6aeaa4026b
Merge pull request #15999 from cpuguy83/15994_ext_volume_bind
...
Set bind driver after volume is created
Upstream-commit: 7c667f9d6e506fb502426f2d98db8c0c124fe03b
Component: engine
2015-09-04 09:47:10 -07:00
b590ee7334
add --insecure-registry warning to online docs
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 5446aac0e539a465a37efbe80c1608f718fe03b6
Component: engine
2015-09-04 10:28:35 -04:00
a2884da2ba
Merge pull request #16043 from sallyom/manDockerfile
...
man Dockerfile ADD/COPY/FROM clarify
Upstream-commit: 4a0606423bc6ab3195bfddafcff2cea9a6135622
Component: engine
2015-09-04 10:03:50 +02:00
6ab00adeae
Merge pull request #16057 from sallyom/manDocker
...
clarify --insecure-registry in man docker
Upstream-commit: 409212be24ade88ffd2cf072d3bffb868e96de7c
Component: engine
2015-09-04 09:56:01 +02:00
1f9dd04dfa
Merge pull request #15877 from Microsoft/10662-trigger
...
Fix trigger count and output
Upstream-commit: 0009852cb0ceadc398c9d30c7f5494848004c20f
Component: engine
2015-09-03 20:04:05 -07:00
35638190ef
Merge pull request #16054 from jfrazelle/update-sqlite3-dep
...
code.google.com is shutting down so update the dep
Upstream-commit: 38ecc7fc32ba2acdb95559292d4a7aed5b1cbabe
Component: engine
2015-09-03 19:20:57 -07:00
1c8b6d6152
Fixes 2 panics initialising tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 69bf17ffbd67fdfbbfbdb09bf7e183ffcfc7811e
Component: engine
2015-09-03 18:26:38 -07:00
4d787283f5
Merge pull request #16066 from jfrazelle/remove-reprepro
...
remove reprepro
Upstream-commit: 90477e8e94b45a52ed8c1a10c48827cef6fc8bdc
Component: engine
2015-09-03 18:20:01 -07:00
6dccafea52
Merge pull request #15706 from clnperez/vendor-helper-use-branch
...
Allow branch name in vendor-helper script
Upstream-commit: 1fa560e6eb73ca55b7e5f9e4227ab5dd4ce310ee
Component: engine
2015-09-03 18:02:06 -07:00
8f7f593e20
Merge pull request #16052 from jfrazelle/fix-release-selinux
...
make docker-engine-selinux findable
Upstream-commit: b01922999626fcafb789eb61957bceaef1f5cdf4
Component: engine
2015-09-03 17:52:39 -07:00
e579f48cbf
Merge pull request #15845 from calavera/refactor_daemon_list
...
Refactor daemon container list.
Upstream-commit: c8c1c472b21fbe7079f5fccbbda8d9652c7c00d3
Component: engine
2015-09-03 20:48:54 -04:00
c7a363d08b
Merge pull request #15846 from ZJU-SEL/11646-fix-path-validations
...
fix 11646 to check volume path in server side
Upstream-commit: 057f53f503d21e004ec4f75eeafa10de1ceecc63
Component: engine
2015-09-03 20:42:37 -04:00
4de5cdb2f1
code.google.com is shutting down so update the dep
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 4a864a755240709612f564f64839604a0697e11f
Component: engine
2015-09-03 17:39:29 -07:00
bbd3497cdd
Fix trigger count and output
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 662010292619c33db7f144890abfdd9a99b423e0
Component: engine
2015-09-03 17:39:19 -07:00
eeddb0adf8
remove reprepro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: e7cf75c103fe8c21af18f6e1afbccb1c21101081
Component: engine
2015-09-03 17:31:49 -07:00
7db3a64e57
Merge pull request #16060 from vdemeester/14756-lint-pkg-term-windows
...
Lint pkg/term/windows package
Upstream-commit: 07d2eae6d57ecdac82fa41ad342b6bb21d537848
Component: engine
2015-09-03 19:54:20 -04:00
b5219c6311
Merge pull request #16041 from runcom/portmapping-doc-cleaning
...
Clean latest api doc from PortMapping and outdated error check
Upstream-commit: 2d605ce53bc45f6d83f3d1c873d57d207d84b7d4
Component: engine
2015-09-03 19:37:34 -04:00
3c8280bd5b
Merge pull request #16067 from jfrazelle/fix-release-branch-in-suites-script
...
fix release branch in suites.sh
Upstream-commit: 9b072fb722e67006c42f8d61ee377ee140e325d6
Component: engine
2015-09-03 16:33:32 -07:00
0249cbd7d9
Update image pull tests
...
Update and migrate existing tests to the `DockerHubPullSuite`. Most
tests were preserved, but refactored and made more exhaustive. One test
was deliberately removed (`TestPullVerified`) as it is unreliable and
that the feature was obsoleted by content trust.
Move all trust related tests to `docker_cli_pull_trusted_test.go`.
Move tests depending on a local registry to `docker_cli_pull_local_test.go`.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f324f4851f28edfd8dab82cd624a4ec1f01cd207
Component: engine
2015-09-03 15:57:41 -07:00
595af68c98
Add integration-cli/checker package
...
Add a `checker` package that adds some utility Checker implementation,
the first one being `checker.Contains`, as well as brining all go-check
provided Checker implementations in scope as a commodity.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: c87cbd3862336fb01addff5d753ff7c8e0d50879
Component: engine
2015-09-03 15:57:41 -07:00
3aa213ceb8
fix release branch in suites.sh
...
we changed the naming scheme of the release branch
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: e38a9ecef6849304b6d961b24af16fbd1f4912d6
Component: engine
2015-09-03 15:48:02 -07:00
1e6fd6c910
Merge pull request #16027 from Microsoft/10662-utimes
...
Windows: Fix dockerfile ADD from HTTP
Upstream-commit: 6ffbea3c94ea4b3f6177dff3e7dc40e4c67dc9f4
Component: engine
2015-09-03 18:44:34 -04:00
32bca980ee
Merge pull request #16022 from nalind/cgo-windows
...
Fix a daemon build error when cgo isn't available
Upstream-commit: f0a5d03400429c6e97efacdb50d175c3fd85ba63
Component: engine
2015-09-03 18:42:58 -04:00
4a69dd626d
clarify --insecure-registry in man docker
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 2d9ea188d4625ee77d5864590ffde6cff4fe0031
Component: engine
2015-09-03 17:10:40 -04:00
ff114b4d32
Lint pkg/term/windows package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3409de971c7bd3c84c324d19f422fcb3c6777f02
Component: engine
2015-09-03 22:25:52 +02:00
140037e825
Merge pull request #16025 from sallyom/overlayfsSelinux
...
selinux/overlay incompatible err
Upstream-commit: 9d0eef55eabeb36ae1f182ed954411f00275f96e
Component: engine
2015-09-03 16:08:55 -04:00
8ebc68df59
Merge pull request #16018 from surya-shodan/master
...
Typo in README.md
Upstream-commit: 6f5eb78519442bc26680e8e5406bbd788a395815
Component: engine
2015-09-03 11:57:06 -07:00
f8d3e36feb
Merge pull request #16036 from Microsoft/10662-httpdirectory
...
Windows: Fix HTTP download directory
Upstream-commit: 8258996cf28a2e25c6c765b48acf9ad889996827
Component: engine
2015-09-03 11:54:53 -07:00
2f2b355be9
Merge pull request #16038 from aboch/sbx
...
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
Upstream-commit: 288275ab60c049fa644f1ce5d36c0c005e8dd02c
Component: engine
2015-09-03 11:48:02 -07:00
afcc143845
make docker-engine-selinux findable
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c7b3e7e7701a30ad0eb3f58d9b0cf3149cc82fda
Component: engine
2015-09-03 08:58:33 -07:00
