ac5e68234e
Merge pull request #22916 from duglin/FixNetTest
...
Fix flaky TestApiStatsNetworkStats test
Upstream-commit: 004ce6b57124c1a99348e1447ac9e00a970d1b34
Component: engine
2016-05-25 18:51:47 +02:00
ecdb255cd3
Merge pull request #22958 from Microsoft/hcs_rpc
...
Windows: Use the new HCS RPC API
Upstream-commit: c7ee50308290d56b70933dfd83bd70e3a9df93d5
Component: engine
2016-05-25 09:25:22 -07:00
504a2ff9e3
Merge pull request #22953 from Microsoft/jjh/TestRunWorkingDirectory
...
Windows: Fix TestRunWorkingDirectory
Upstream-commit: 8c70ab803c49816de8124703db6635e9c5c7ce25
Component: engine
2016-05-25 17:54:39 +02:00
558c1d058e
Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace
...
Fix a race in pkg/integration.TestChannelBufferTimeout
Upstream-commit: 53e2deb1590c8d0b6bf7c700c630dc432ea772d4
Component: engine
2016-05-25 11:35:23 -04:00
6eea85e6f1
Merge pull request #22960 from justincormack/seccompdefnotarm
...
Do not run the seccomp tests that use default.json on non x86 architectures
Upstream-commit: 4d376e9cc265c098c7faf03d0e75c1164cbf24e0
Component: engine
2016-05-25 17:20:16 +02:00
ddcc4a0981
Merge pull request #22969 from AkihiroSuda/fix22963LogRace
...
Fix a race in daemon/logger.TestCopier
Upstream-commit: a41e823c1bcbaafca1081dd23a7af3fa25ac946f
Component: engine
2016-05-25 11:09:51 -04:00
38a1e359da
Merge pull request #22966 from AkihiroSuda/fix22964MemRace
...
Fix a race in pkg/discovery/memory
Upstream-commit: cef4ea0b9759386800aae27d6fa92c80d4465745
Component: engine
2016-05-25 10:58:31 -04:00
e0c1ae90e0
Merge pull request #22968 from mbentley/fix-dm-docs
...
Fixed lost thin pool devicemapper docs
Upstream-commit: 5bd6067b85cdaa80cfbd43648f9b0a57e1cf58b9
Component: engine
2016-05-25 16:40:52 +02:00
e79985ff9b
Re-apply changes made in 24ec73f
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com >
Upstream-commit: 0b8ea4387a3b1e415a49b9c6dbead858891a5ce9
Component: engine
2016-05-25 08:46:39 -04:00
0f6a9d4e70
Fix thin pool devicemapper docs overwritten
...
Signed-off-by: Matt Bentley <matt.bentley@docker.com >
Upstream-commit: 79205c3f061c4b690a459cb2b08b6a7df7af327c
Component: engine
2016-05-25 08:45:51 -04:00
3e8a3ed291
Merge pull request #22962 from normalfaults/b
...
fixed spelling error in windows.go
Upstream-commit: 2a4b4a813342294a6191425caba471a94c8a39f6
Component: engine
2016-05-25 12:21:08 +02:00
5912cc64b5
Merge pull request #22952 from tophj-ibm/multiarch_daemon_test_fix
...
Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
Upstream-commit: cd159fba8529efe70ea634842a024560dbfd3aec
Component: engine
2016-05-25 10:19:41 +02:00
d11b12b133
Merge pull request #22974 from albers/completion-ps-filters
...
bash completion for `docker ps -f {before,since}`
Upstream-commit: 5383824e08a58aa83c6ac018706569345fa9e3ea
Component: engine
2016-05-25 16:05:04 +08:00
a953a5531b
Merge pull request #22967 from srinsriv/master
...
Update dind
Upstream-commit: 522698dd43e1f55b3df8a83b6b11f107a519ab84
Component: engine
2016-05-25 09:55:10 +02:00
0de35f39e7
bash completion for docker ps -f {before,since}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c49d3274067055dc830d97f1490a84aa73e403e6
Component: engine
2016-05-25 09:35:33 +02:00
a4084df811
Fix a race in pkg/integration.TestChannelBufferTimeout
...
Update #22965
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: d0d828e292733fa1d5e2d09d7f184be69129e757
Component: engine
2016-05-25 07:09:38 +00:00
1c46623429
Fix a race in daemon/logger.TestCopier
...
Update #22963
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: ab533f06510a14a023c056604f9520741073acd3
Component: engine
2016-05-25 05:07:24 +00:00
3b8abc6850
Fix a race in pkg/discovery/memory
...
Fix #22964
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 1f8fbbc0d830ad9a887d04a25152ea344688903b
Component: engine
2016-05-25 04:01:43 +00:00
966dbfdb11
Update dind
...
Typo
Signed-off-by: Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com >
Upstream-commit: 27afaf3774d7f46028ab72192d4c1b65f8d88b87
Component: engine
2016-05-24 20:42:28 -07:00
b520646fdd
The option --add-host and --net=host should not be mutually exclusive.
...
This fix tries to address the issue raised in #21976 and allows
the options of `--add-host` and `--net=host` to work at the same time.
The documentation has been updated and additional tests have been
added to cover this change.
This fix fixes #21976 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 90bd41a74d57080711678bffa2bc4371020ee3a5
Component: engine
2016-05-24 18:49:11 -07:00
b39fa693a7
Merge branch 'master' into b
...
Upstream-commit: 59bb86a964c38d0f2cc724c686803472bb48968b
Component: engine
2016-05-24 21:43:45 -04:00
3d16c1ca14
fixed spelling error in docker cli run test
...
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com >
Upstream-commit: f91acbaee452191f406d31e3f3fd44210aa17fbf
Component: engine
2016-05-24 21:43:22 -04:00
b5619754dc
fixed spelling error in windows.go
...
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com >
Upstream-commit: 36a9151b27168076073770142d0b354f0e83fdb2
Component: engine
2016-05-24 21:40:08 -04:00
4d6727d7fe
Do not run the seccomp tests that use default.json on non x86 architectures
...
The generated profile that we check in is for amd64 and i386 architectures
and does not work correctly on arm as it is missing required syscalls,
and also specifies the architectures that are supported. It works on
ppc64le at the moment but better to skip the test as it is likely to
break in future.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 75385dc216e784d24535326376352de03eaeb059
Component: engine
2016-05-24 17:47:30 -07:00
d8cc018311
Change Docker to use the new HCS RPC API
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 959c1a52bf11dd6b3e65f10bbaa867bfabba6838
Component: engine
2016-05-24 16:36:51 -07:00
e230ff1485
The option --dns, --dns-search, --dns-opt and --net=host should not be mutually exclusive.
...
This fix tries to address the issue raised in #21976 and allows
the options of `--dns`, `--dns-search`, `--dns-opt` and `--net=host`
to work at the same time.
The documentation has been updated and additional tests have been
added to cover this change.
This fix fixes #21976 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 23821fe5867427fa36c265bc994b1a2c3cf9b21f
Component: engine
2016-05-24 16:03:26 -07:00
f99c99aaac
Windows: Fix TestRunWorkingDirectory
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 257494bd0a017cad264609f1a77b9af3ab7f991c
Component: engine
2016-05-24 15:13:06 -07:00
6373766983
Merge pull request #22925 from jstarks/fix_integration_test
...
pkg/integration: Port tests to Windows
Upstream-commit: 29dbcbad878483d9239d6a432c85620aced895c4
Component: engine
2016-05-24 17:31:43 -04:00
2e5b933fb0
Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
...
Fixes the test by loading in the architecture specific busybox
image when the test daemon starts.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 7832e2ae82ae56e9719c6930b054f643285a79b3
Component: engine
2016-05-24 16:33:49 -04:00
2453234b4d
Merge pull request #22922 from justincormack/ppc64le-seccomp
...
Enable seccomp on ppc64le
Upstream-commit: bdc06cf8f8f4868186e3a843482afed48361cc09
Component: engine
2016-05-24 16:08:50 -04:00
d767f40c10
Merge pull request #22948 from dmcgowan/remove-unused-overlay-mounted
...
Remove unused mounted function in overlay
Upstream-commit: 0802401d22790ec85a620ac1c1ee41f81025c4a8
Component: engine
2016-05-24 13:08:06 -07:00
12513175c8
Merge pull request #22091 from amitkris/build_solaris
...
Get the Docker Engine to build clean on Solaris
Upstream-commit: 86a7632d63bdddb95aaf1472648056a4fb737d38
Component: engine
2016-05-24 21:41:36 +02:00
866c631581
pkg/integration: Port tests to Windows
...
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 8fc825364ac60848d4278c00429838c3f28f2cd7
Component: engine
2016-05-24 12:12:48 -07:00
0f8f43b91e
Merge pull request #22935 from thaJeztah/add-justin-to-maintainers
...
Add Justin Cormack to maintainers
Upstream-commit: 48a53d2e8c4db73c85c90c748d2f323ab458e8b9
Component: engine
2016-05-24 20:23:52 +02:00
1bdae7f37d
Remove unused mounted function in overlay
...
The mount check is now done by the FSChecker. This function is no longer needed and shouldn't be called.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 5cc082473068b00dee123f8388a79d7a48842a57
Component: engine
2016-05-24 11:02:07 -07:00
0ec1e0058a
Merge pull request #22932 from chenchun/fix_build
...
Fix building image error if bridge network is disabled
Upstream-commit: 38217d43531c721da952a9de2a89b08397f7c029
Component: engine
2016-05-24 10:33:34 -07:00
eaeb1bdc9d
Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md
...
Fix incorrectly named "ip-mask" and "api-cors-headers" options
Upstream-commit: f0d6fd93a2b2cbe4ad177524ca52018dae2fcce7
Component: engine
2016-05-24 18:21:52 +02:00
6f4700f12d
Merge pull request #22941 from AkihiroSuda/fix22940
...
Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack
Upstream-commit: f10a222de1cc756bb14d157b778d820fac3561aa
Component: engine
2016-05-24 18:13:44 +02:00
3185dc9996
Merge pull request #22264 from aaronlehmann/updated-image-spec
...
Update image specification for content-addressability changes
Upstream-commit: 7faa2a40bcfc2c8600a6895d09235081730d6f46
Component: engine
2016-05-24 18:06:52 +02:00
2e9725c51d
bash completion for daemon events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: cc6a1b8bb3849f2ead3f89fc18a573034e1386f1
Component: engine
2016-05-24 17:19:03 +02:00
6696b4b541
Merge pull request #22906 from nshalman/patch-1
...
Clarification about 'docker build --build-arg'
Upstream-commit: ce07eac570e90ed8aa69472bae463902c075e078
Component: engine
2016-05-24 15:33:27 +02:00
2332228518
Clarification about 'docker build --build-arg'
...
See #22860
Signed-off-by: Nahum Shalman <nshalman@omniti.com >
Upstream-commit: fd7d99ed283bea260fa5e674ee8200038196fdac
Component: engine
2016-05-24 09:25:11 -04:00
df271497b6
Merge pull request #22900 from AkihiroSuda/fix22020
...
update docs/reference/commandline/cp.md
Upstream-commit: 6a385a00226dc7d8a35406ae284bb6731444d524
Component: engine
2016-05-24 14:06:02 +02:00
bda8efbc36
Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack
...
Fix #22940
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 1670914b8a56ab8e6ead38739fddb416b61e444f
Component: engine
2016-05-24 11:29:55 +00:00
4e2b010c12
update docs/reference/commandline/cp.md
...
Close #22020
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: cb1635c9cf4813c95a1c72dd35b13e8acebfbfb6
Component: engine
2016-05-24 11:09:38 +00:00
f5925d0f50
Add Justin Cormack to maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e427e4b108e9219316a56f72219a6fee93088da0
Component: engine
2016-05-24 11:09:39 +02:00
850246a4c4
Merge pull request #22590 from yongtang/22463-docker-daemon-events
...
Emit events for docker daemon
Upstream-commit: d76d38c7d028754c48f842e4631c2d897e63198d
Component: engine
2016-05-24 11:05:39 +02:00
6717a252a9
Fix building image error if bridge network is disabled
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: a8d013495c479cdc18fa7751413ef67334f37ee6
Component: engine
2016-05-24 16:20:26 +08:00
da14c60e92
Merge pull request #22928 from friism/patch-3
...
remove duplicated text
Upstream-commit: bf7bae9662a2de9cdb689ac813c503fe1157d6da
Component: engine
2016-05-24 08:38:40 +02:00
d6f4430048
Merge pull request #22541 from crosbymichael/graph-restore
...
Implement graph driver restore on reboot
Upstream-commit: d7dfe9103bfc275494d936a5d89f3067b0aedbc9
Component: engine
2016-05-23 22:57:23 -07:00
