40c9bed676
Windows CI: Port docker_cli_start_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b47749102d8bfde1ec6f87b2cd291b8f45146b67
Component: engine
2016-02-02 18:23:29 -08:00
d23aa0257d
Merge pull request #19935 from Microsoft/jjh/onemorereliabilityhack
...
Windows CI: One more reliability hack
Upstream-commit: c2bf90eb59d1d9e7565ba381d4c86bd48d9c36d0
Component: engine
2016-02-02 16:49:29 -08:00
d2d1dc51de
Merge pull request #19761 from HackToday/enhancesortattr
...
Sort the attributes for events
Upstream-commit: 1bc4c99372fa458c70eeb411575a1c538912521d
Component: engine
2016-02-02 16:08:23 -08:00
43913f9547
Merge pull request #19911 from Microsoft/jstarks/npipe
...
Windows: Add support for named pipe protocol
Upstream-commit: 83ee24e52b04fd8cf1f7366dff04baa43d89ec49
Component: engine
2016-02-02 15:59:45 -08:00
151776465a
Merge pull request #19901 from calavera/debug_cli_tests
...
Always show debug information in the info output
Upstream-commit: 85a32baa3be8a5f2e9dd5262e03726fe9d4d52b3
Component: engine
2016-02-02 15:56:55 -08:00
9615203fd9
Merge pull request #19915 from wenchma/add_net_bind_test
...
Add integration test for network host bind option
Upstream-commit: 5ba3edd4862a3308ff4863d4aef049159b4d31c8
Component: engine
2016-02-02 15:34:13 -08:00
2f29f9f7fc
Merge pull request #19936 from vieux/fix_min_version
...
fix error message on version too low
Upstream-commit: 2a35a1a6dc3cdb68ac98a2f9fdb53f4889b339d7
Component: engine
2016-02-03 00:21:07 +01:00
fd18daf360
Merge pull request #19800 from wenchma/19425-TestApiStatsNetworkStats
...
Optimize TestApiStatsNetworkStats and TestApiStatsNetworkStatsVersioning
Upstream-commit: 01cc315322597a00b3f82da140d922a6ebc5b7b3
Component: engine
2016-02-02 14:56:51 -08:00
2d432f910a
Merge pull request #19917 from WeiZhang555/add-lock
...
Lock container when set state to restarting
Upstream-commit: 67d6154cc26cceccc554ebb54ae4dcbad44047e4
Component: engine
2016-02-02 14:55:51 -08:00
d7248ffec7
fix error message on version too low
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0fd9b4067d5126a8059dc2821b835d3bde26e7eb
Component: engine
2016-02-02 14:16:15 -08:00
46e42d4581
Add regression tests for client debug flag.
...
- Add client debug info to the `docker info` command.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9f315dd328a33b51133a41067a508a8b59166a39
Component: engine
2016-02-02 16:57:36 -05:00
9dd09cab07
Windows CI: One more reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 14c53160d7477813839f6996cf340004ebe335c5
Component: engine
2016-02-02 13:15:35 -08:00
794f697ccd
Merge pull request #19932 from calavera/fix_config_validation
...
Make sure flat options are not parsed as config structures.
Upstream-commit: b6a6ed7200281a2c2d0ca0824e69beb7240e6ddd
Component: engine
2016-02-02 15:36:25 -05:00
bfd1c80469
Make sure flat options are not parsed as config structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: b6766e3063dccfc58c0ab1cfc9687cfa2947be6a
Component: engine
2016-02-02 14:45:37 -05:00
5e084d01fe
Merge pull request #19927 from jfrazelle/update-comment
...
update comment
Upstream-commit: 51620020aff6f31447a71a5a66af0066c524649a
Component: engine
2016-02-02 14:37:43 -05:00
0c5fc842f1
Merge pull request #19926 from Microsoft/jjh/refixcihack
...
Windows CI: Re-do TP4 CI reliability hack
Upstream-commit: 6b7a3f0c827163df13cff78a8ee45337b56003e1
Component: engine
2016-02-02 11:02:08 -08:00
5f147f683f
Merge pull request #19868 from HackToday/fixwindows
...
Fix windows CI test
Upstream-commit: f830cec78a03ab7e6dba48afff261c2e8ed0788d
Component: engine
2016-02-02 19:58:29 +01:00
198aabc470
Merge pull request #19894 from samneirinck/powershell-support
...
Add powershell completion support
Upstream-commit: 6bde64ab2d320cececa09bc8e9f8258fc59a7e4a
Component: engine
2016-02-02 13:50:45 -05:00
9bcae3912f
Delegation is not experimental
...
Change wording that described user delegation as an experimental
feature.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: e516b5651bf5de3281a37d3e737a8c154f896189
Component: engine
2016-02-02 10:32:14 -08:00
fbdea5f61d
Merge pull request #18605 from fgimenez/9969-add-sni-support
...
Added cli SNI integration test
Upstream-commit: 7abc7b383c8f37812db85fd9e4020c2ce6f30f32
Component: engine
2016-02-02 10:12:44 -08:00
503a6ed4ff
update comment
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 9b8d328666a6cd5313208cdf5f116825f06dccdc
Component: engine
2016-02-02 10:03:52 -08:00
7d1db1c269
Merge pull request #19851 from hqhq/hq_remove_libseccompa
...
Cleanup libseccomp.a hack since dockerinit is gone
Upstream-commit: 63ad7df2aa935a56c7ef0ac4d43d48a5e8315499
Component: engine
2016-02-02 09:52:35 -08:00
681c5de598
Windows CI: Re-do TP4 CI reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6f0831930fbccfbb2b7552b64a4b54698b4b861c
Component: engine
2016-02-02 09:36:18 -08:00
9653a86af8
Merge pull request #19924 from moxiegirl/title-per-scott
...
Changing menu label from Engine > Docker Engine
Upstream-commit: 202cccc3d3d889c4671e9836d48076ba1e83f665
Component: engine
2016-02-02 18:14:37 +01:00
b1cef3049c
Merge pull request #19923 from thaJeztah/update-etc-hosts-docs
...
Add note about legacy links
Upstream-commit: 6144d24b03044e68ed8a062d741be8e37d9e7d7b
Component: engine
2016-02-02 18:09:22 +01:00
37c50543e9
Add note about legacy links
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1cfab85c0ea759fed753dc2c71cdb4b87ad62400
Component: engine
2016-02-02 18:06:09 +01:00
4241099b10
Changing menu label from Engine > Docker Engine
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: c49b6ce4e16d570432941fc686c05939dc888fc9
Component: engine
2016-02-02 09:03:45 -08:00
d783ac4c1e
Merge pull request #19817 from icecrime/breaking_changes
...
Add doc page for breaking changes
Upstream-commit: 4d4c284ef4239ed0f3813816d1036aef32af8b58
Component: engine
2016-02-02 17:43:32 +01:00
53c800043a
Merge pull request #19865 from mavenugo/ndocs
...
Docs cleanup for networking features added in 1.10
Upstream-commit: ef52a53c34d9f128d9435d031442509837c25c02
Component: engine
2016-02-02 17:36:46 +01:00
4acd5eb7af
Merge pull request #18362 from runcom/tunable-SetMaxThreads
...
daemon_unix: set golang runtime max threads
Upstream-commit: 4f37e14e9c1f57015d4a212bc48601eaef0fc733
Component: engine
2016-02-02 08:36:28 -08:00
7cb0758c9a
Merge pull request #19909 from Microsoft/jjh/testunit-daemon
...
Windows CI: Fix test-unit for daemon
Upstream-commit: 2b565014800d7126a5645f9bc3296f183d0f5257
Component: engine
2016-02-02 16:18:02 +01:00
01f2954590
Docs cleanup for networking features added in v1.10
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6f863cfa18f30d1df2f1f81b2b4f456dee2a73b8
Component: engine
2016-02-02 06:10:41 -08:00
ec3cd49e30
Fix memory-swap description in older API versions
...
A value of -1 disables the *limit* so enables unlimited swap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1c95b858ac040974d2be73bb31d0d59af9b0b960
Component: engine
2016-02-02 14:49:14 +01:00
4bdc3a71f5
Merge pull request #19912 from HackToday/fiximage
...
Correct old virtual size
Upstream-commit: 390077fcdcdf005bc3dde821596c88e355ef97ad
Component: engine
2016-02-02 14:06:58 +01:00
642e9a30eb
Correct old virtual size
...
In new content addressable model, image no longer
have virtual size column, it is now 'size'. So we
need to update related docs about them.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 1ab7d76f30f3cf693c986eb827ad49a6554d806d
Component: engine
2016-02-02 12:28:33 +00:00
93226572ef
Lock container when set state to restarting
...
After exec driver run, container lock is lost, so we should lock
container when changing its state to `restarting`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 155714c59650a7b9b8f890f4d20c83ea9b80206b
Component: engine
2016-02-02 19:50:06 +08:00
ed5a9b6268
Add integration test for network host bind option
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 4f1d876e4c6907154e0dbb52fcc1ecc2643c6915
Component: engine
2016-02-02 18:01:04 +08:00
fc2f331561
Merge pull request #19822 from Microsoft/jjh/testexeccli
...
Windows CI: Initial porting CLI TestExec*
Upstream-commit: 5cdc0dfce3b058874566721b1f111baaa19df18b
Component: engine
2016-02-02 08:32:28 +01:00
9de80c7080
Fix windows CI test
...
The windows CI is not clean in some tests, this try address that.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 7ed10d4a4cc724fe6ce3f623051546710a18a3b6
Component: engine
2016-02-02 04:54:14 +00:00
19be4d0467
Windows CI: Fix test-unit for daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 42f2621b0e19f263902e9f2eb3df0ef6d27d5fa4
Component: engine
2016-02-01 20:40:57 -08:00
27daf9cbce
Windows: Add support for named pipe protocol
...
This adds an npipe protocol option for Windows hosts, akin to unix
sockets for Linux hosts. This should become the default transport
for Windows, but this change does not yet do that.
It also does not add support for the client side yet since that
code is in engine-api, which will have to be revendored separately.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 0906195fbbd6f379c163b80f23e4c5a60bcfc5f0
Component: engine
2016-02-01 19:46:30 -08:00
eb79a73a95
Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
...
Windows CI: TP4 reliability hack
Upstream-commit: a39ad952ec1efc3b7536d3d8a93e96a22cd1818b
Component: engine
2016-02-01 22:30:51 -05:00
52763c5ef6
Merge pull request #19902 from Microsoft/jstarks/revendor_hcsshim_fix_docker_crash
...
Revendor Microsoft/hcsshim and vendor Microsoft/go-winio
Upstream-commit: a034ac66eb766891676d1417826756870185de40
Component: engine
2016-02-01 22:30:08 -05:00
69d07840eb
Merge pull request #19907 from tiborvass/tty-debug
...
Prevent stdin from hanging
Upstream-commit: ec6bfebc0f36c15793be7e1a581cab0aafcb31c1
Component: engine
2016-02-01 21:57:32 -05:00
a3ac623fc2
Merge pull request #19861 from fangyuan930917/19350-remove-Info
...
remove the unused Info interface in daemon/execdriver/driver.go
Upstream-commit: 193ef9f0c150b26f960a4b09ecc3197b6e1965fb
Component: engine
2016-02-01 21:44:39 -05:00
32a339fec6
Merge pull request #19896 from calavera/same_rm_error_message
...
Make error message consistent when removing containers fail.
Upstream-commit: 3c0c115ec89031e0cbd9e739099828342efc872c
Component: engine
2016-02-01 21:19:42 -05:00
e2603dbc62
Windows CI: TP4 reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2ebcb48cf1b4f883260b62f687e2c54926749b68
Component: engine
2016-02-01 18:02:57 -08:00
2c45eb2fa9
Skip Close()-ing stdin on Darwin. The Return.
...
This was accidentally removed in https://github.com/docker/docker/pull/16289
Now adding it back.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 51795c083624b106fe7f338213cbc3d3812f31af
Component: engine
2016-02-01 20:38:01 -05:00
6925137469
Merge pull request #19899 from aboch/vnd
...
Vendoring libnetwork 0.6.0-rc7
Upstream-commit: f1e8d2c2958dc0142f0fb2b1efd349e54a92ef3f
Component: engine
2016-02-01 17:10:31 -08:00
dce9d7fda4
remove the unused Info interface in daemon/execdriver/driver.go and related code
...
Signed-off-by: Fangyuan Gao <21551127@zju.edu.cn >
Upstream-commit: 5d07d83ee0802391ff2ed5e10838376a9b817bba
Component: engine
2016-02-02 09:04:52 +08:00
