f0ecd6735e
Merge pull request #18101 from IanLee1521/patch-1
...
Fix minor grammar mistake.
Upstream-commit: 7a1b05ccce18cbec4742c0a766f3424f817837df
Component: engine
2015-11-20 11:43:42 +01:00
4cd1a52462
Merge pull request #18026 from woodvi/doc-network-tutorial
...
change "Web" to "web" to match case-sensitive name used for creation;…
Upstream-commit: d8ea32caa8b312d5b3b01b4e72b8e0e56d958653
Component: engine
2015-11-20 10:46:00 +01:00
fb0212db59
Merge pull request #17861 from gissehel/apt-source-doc
...
explicit way to express that docker.list are different choices and not just one big file
Upstream-commit: 20905ec452ef0139027c6b0e193dda0d83a59f69
Component: engine
2015-11-20 10:06:13 +01:00
295eff51a3
Merge pull request #18079 from moxiegirl/fix-bad-markdown
...
Small Markdown Fixes to storage driver/commands ref
Upstream-commit: 3dac1fb18915f3aee1fcdeeb0688340fe6809143
Component: engine
2015-11-20 09:22:04 +01:00
7c1d3da9d9
Small changes to storage driver/commands ref
...
Entering V's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 9941d5bc33bc50c9e4e1fcba05c0f011bc0ae082
Component: engine
2015-11-19 17:13:23 -08:00
5832a3ebde
Merge pull request #17005 from mavenugo/restart
...
Adding a restart test to make sure #16887 doesnt happens again
Upstream-commit: ee03a05595e6ecd373553d33a01aff4d18bcc63c
Component: engine
2015-11-19 17:01:34 -08:00
e1191bf537
Merge pull request #17459 from brahmaroutu/Power_Z_CI
...
Build and test Docker on IBM Power and Z using gccgo. Enable CI on Po…
Upstream-commit: 249b3a9479048bcec8da0666c2e224dddcfc3de8
Component: engine
2015-11-19 15:50:07 -08:00
1d43e38301
Merge pull request #18082 from MHBauer/gh9406
...
Remove defaults for flags/options that expect no value
Upstream-commit: 9c21e852b2674a68d9b0fbbada368f5b7818b494
Component: engine
2015-11-19 15:06:21 -08:00
0d167eb54d
Merge pull request #18103 from crosbymichael/image-link
...
Remove alt from markdown image
Upstream-commit: 0d98e2470fd985f3c113f44a93084d87e1a167f9
Component: engine
2015-11-19 14:09:43 -08:00
e5f9171396
Remove alt from markdown image
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 38a58a4a1c92e6efa4bcf2a809883cef8c391f05
Component: engine
2015-11-19 14:06:16 -08:00
c99e76c95d
Merge pull request #18102 from mavenugo/sb_ep_race
...
Fixed an endpoint delete issue with a possible stale sbox
Upstream-commit: da969aac5ab0b1376615ed54fb54a909c98f05f8
Component: engine
2015-11-19 13:55:28 -08:00
3221274c6e
Merge pull request #18084 from wenchma/18054_exec_start_fix
...
Update docs and test of exec create api return codes
Upstream-commit: 8e6e38990cb09eca2575263240d45a2a55db292e
Component: engine
2015-11-19 13:51:46 -08:00
27b2c588e8
Merge pull request #18076 from rhvgoyal/unmount-recursive
...
Unmount recursively to unmount volumes
Upstream-commit: 24fb3659dfe1b4f4dfa4592699fb53d0868a95fe
Component: engine
2015-11-19 13:46:48 -08:00
fd8d0f506e
Merge pull request #17908 from calavera/carry_17059
...
[Carry 17059] allow filtering containers by any status
Upstream-commit: 37f64ded44249fb174ba1797d6f6183575375300
Component: engine
2015-11-19 13:24:43 -08:00
60990134ed
Merge pull request #18096 from Microsoft/jjh/dockerinfoav
...
Windows: [TP4] docker info crashes
Upstream-commit: b205b06d3e4ec4d1850f1a2d7eebb43f13e9ef46
Component: engine
2015-11-19 21:48:02 +01:00
cc6e53230d
Fixed an endpoint delete issue with a possible stale sbox
...
Stale sandbox could be a result of stress tests on ungraceful
restarts such as #17984
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 423b55c4b4aaaa55188b3aeca2b6b2005b19e7ea
Component: engine
2015-11-19 12:46:37 -08:00
712fdcff89
Use lazy unmount to unmount volumes
...
Volumes can have more mount points beneath them and unmount will fail. This
is the case when a bind mounted directory on host already had a mount point
underneath it. So use lazy unmount instead.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: b9e701b203ff49966aac00e058feb5d46bbb97f0
Component: engine
2015-11-19 20:46:07 +00:00
61aac55c3c
Fix minor grammar mistake.
...
Signed-off-by: Ian Lee <IanLee1521@gmail.com >
Upstream-commit: ad7696a78775df7cc671113b29fb34ca66b3ace5
Component: engine
2015-11-19 12:24:25 -08:00
9c09b9b37a
Test that paused containers show up filtering by status.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 2a07b19fd8fd402b4ec7b7814f85d099c8b8efca
Component: engine
2015-11-19 14:32:25 -05:00
1d7fc30a8e
allow filtering containers by any status
...
Signed-off-by: Kamil Domański <kamil@domanski.co >
(cherry picked from commit 9ada6a06c57ce4ed4bfad50f603962b7b9ce6fb1)
Upstream-commit: f30364c5835452598e58781f360681f2d77fa16c
Component: engine
2015-11-19 14:11:41 -05:00
9f741a440b
Windows: [TP4] docker info crashes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 37d2a7003864f8bdb5d8f6e3d9dcb4367fc94a6a
Component: engine
2015-11-19 11:02:25 -08:00
c97969e0fa
Merge pull request #18090 from vdemeester/17478-follow-up-cleanup-pkg-platform
...
Follow-up of 17478, unexport runtimeArchitecture method
Upstream-commit: aade9536b6b64f6db385f38078b20bff846aec54
Component: engine
2015-11-19 14:00:23 -05:00
ab09680165
Merge pull request #18083 from Mashimiao/opt-weightdevice-fix-typo
...
opts/weightdevice: fix typo
Upstream-commit: 758fae5f6b079b0125a657854e7e853d638dc569
Component: engine
2015-11-19 19:44:18 +01:00
9915694041
Merge pull request #18064 from hypriot/17478-fix-for-arm
...
Change casting of utsname.Machine to fix make binary for ARM
Upstream-commit: 43cf875633b63983bbbb7829102183242404eef7
Component: engine
2015-11-19 19:42:20 +01:00
135336d608
Move charsToString to architecture dependent source to fix casting problem
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 7c1d49d90cbd91d7cc06d92686e2d09dd3dcac27
Component: engine
2015-11-19 18:09:08 +01:00
f51688acff
Remove defaults for flags/options that expect no value
...
- isZeroValue function from upstream go
- covers booleans, strings and numbers
- change integration to reflect new behavior
- resolves #9406
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 48718a3c772681b4a3644ba304d37fb9382e6f73
Component: engine
2015-11-19 08:37:51 -08:00
7d68517eab
Update docs and test of exec create api return codes
...
Fixes issue #18054
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 01b86d612cba22602509b436aad36d41135f14ce
Component: engine
2015-11-19 22:22:27 +08:00
521256e49f
Follow-up of 17478, unexport private method
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0ff3c10aa8328c1f574ae6dd8caf5e20c3b97dfa
Component: engine
2015-11-19 14:55:57 +01:00
12f51add56
Merge pull request #17704 from LK4D4/default_cgroupfs
...
Use fs cgroups by default
Upstream-commit: c32f8bb36a5f1b2fe0586a1e080c14d8a6b68610
Component: engine
2015-11-19 14:01:13 +01:00
f0648cade3
opts/weightdevice: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 8d4c0ba27489b51bfce01bc37fa3fe88612bd390
Component: engine
2015-11-19 17:03:46 +08:00
39092c8452
Adding a restart test to make sure #16887 doesnt happens again
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: be9b7a2459fef01e0f5cd3a8d1ad2dc822a5b1dd
Component: engine
2015-11-18 23:29:25 -08:00
92c9b9e9d4
Use fs cgroups by default
...
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 419fd7449fe1a984f582731fcd4d9455000846b0
Component: engine
2015-11-18 16:16:13 -08:00
1ec73033b7
Merge pull request #18065 from calavera/one_container_constructor_to_rule_them_all
...
Remove the container initializers per platform.
Upstream-commit: 877fe61f7538a36c5fe312221356f13b83abbf64
Component: engine
2015-11-18 14:06:47 -08:00
431431a2df
Merge pull request #18030 from Microsoft/sjw/pull_id_hack
...
[TP4] Windows: hacking around content addressable IDs for temporary fix.
Upstream-commit: 0d2ea52f03f2b62e5053ed056fc4db6ab305a6bc
Component: engine
2015-11-18 11:08:13 -08:00
3ac379c684
Merge pull request #18069 from vdemeester/fix-volume-doc-typo
...
Fix a small typo in volume_inspect.md
Upstream-commit: ec721639492cd4a2feb3f7a843429a923262734d
Component: engine
2015-11-18 10:14:15 -08:00
92d26f8f83
Fix a small typo in volume_inspect.md
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a96be2930a64be88a5e8bf0e3b0283c657f73844
Component: engine
2015-11-18 16:02:24 +01:00
b104ad8df6
Remove the container initializers per platform.
...
By removing deprecated volume structures, now that windows mount volumes we don't need a initializer per platform.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 060f4ae6179b10aeafa883670826159fdae8204a
Component: engine
2015-11-18 08:41:46 -05:00
550ebeac8f
Merge pull request #17973 from moxiegirl/fix-networking-issue
...
Fixing issue noted by user
Upstream-commit: 0780ad4857bb7db1caaf6c4c1d60970d5695c464
Component: engine
2015-11-18 12:49:11 +01:00
420b5b0afe
Merge pull request #17992 from nak3/fix-wrong-setting-in-systemd
...
Fix invalid proxy setting example
Upstream-commit: 3f5e5b8f57f5b4c1eb4ead9327f9d071f8fd5b8a
Component: engine
2015-11-18 12:48:41 +01:00
3989d53716
Merge pull request #18059 from QuentinPerez/typo
...
Fix typo in ARM.md
Upstream-commit: 1b1af308da301fbcc950c27d1245aff485f26855
Component: engine
2015-11-18 12:46:19 +01:00
6c12b3a81b
Merge pull request #18062 from svetlyak40wt/patch-1
...
Fix header levels for 1.9 release notes
Upstream-commit: 080b3e7527cc7c116376970d14a31f5cb6ac250b
Component: engine
2015-11-18 12:45:24 +01:00
934c18764d
Merge pull request #18050 from LK4D4/simple_err_registry
...
registry/registry.go: simplify logical expression
Upstream-commit: 927d0be4d8a9568486251a62e25a444cd19ff4ee
Component: engine
2015-11-18 11:51:55 +01:00
53e544a9dd
Fix header levels for 1.9 release notes
...
This way, parsers like allmychanges.com will be able to extract structured information about release
Signed-off-by: Alexander Artemenko <svetlyak.40wt@gmail.com >
Upstream-commit: 4cef3477b528162053a53ac05eabebf524be8be0
Component: engine
2015-11-18 12:53:48 +03:00
5ba2d283e5
Merge pull request #18046 from LK4D4/carry_16822
...
Revert AppArmor skip tests
Upstream-commit: 7179c89943d0447066bdac30d06e8a8054d2f6d3
Component: engine
2015-11-18 10:37:53 +01:00
63ffbd873f
Merge pull request #18055 from vincentbernat/fix/zsh-invalid-cache
...
zsh: ensure we have enough commands to store in the cache
Upstream-commit: 33d9ae358cbeb7093a61eff9b2fa7d842e1d96f1
Component: engine
2015-11-18 10:36:32 +01:00
468c0627ce
Merge pull request #18056 from vincentbernat/fix/zsh-no-lxc
...
zsh: remove lxc-related completion
Upstream-commit: 5d53e39c02abcc768db9f504d02dcb2474b4c7d7
Component: engine
2015-11-18 10:35:59 +01:00
3da1f466c4
Merge pull request #17991 from nak3/proxy-env
...
docker info suppports case-insensitive proxy env settings
Upstream-commit: 57b42250ce2afb9a0a082f02fe52c9179bee6bb4
Component: engine
2015-11-18 10:35:06 +01:00
ce3541ad8a
Merge pull request #18004 from Gobella/master
...
update docker_cli_pull_trusted_test.go
Upstream-commit: db08adb5cbeefeba5c0c094f267863cb145c25f9
Component: engine
2015-11-18 10:32:28 +01:00
0ee800bcb5
Fix typo in ARM.md
...
Signed-off-by: Quentin Perez <qperez@ocs.online.net >
Upstream-commit: 25cfa80119df7e2859729bdac4bae4a753b82d62
Component: engine
2015-11-18 09:46:39 +01:00
9ac360f32a
zsh: remove lxc-related completion
...
LXC support has been deprecated and the related completion has been
removed in #17700 but was added back in #17334 .
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: 8105a3a366bb22d1df843c828a16b6cae26e9531
Component: engine
2015-11-18 08:13:03 +01:00
