Jess Frazelle
65bd47ac3a
Merge pull request #15862 from calavera/share_shm_and_mqueue
...
Share shm and mqueue between containers.
Upstream-commit: 23750fb80280e6770590b0ea30781c43f42e430d
Component: engine
2015-09-24 11:23:59 -07:00
David Calavera
ea22c47211
Merge pull request #16538 from Microsoft/10662-escapeargs
...
Windows: Fixed escaping of command line arguments
Upstream-commit: c8bc02ea35775b048cc84a9c10d6284675f3b297
Component: engine
2015-09-24 11:18:29 -07:00
Jess Frazelle
6444463820
Merge pull request #16507 from azurezk/testcase_nit
...
TestInspectInt64 to be neat
Upstream-commit: ccba7c3e1417724183d6537a3ec27f6c5bed7e6a
Component: engine
2015-09-24 11:12:43 -07:00
Jess Frazelle
247b98190f
Merge pull request #16480 from sunyuan3/TestRunWithKernelMemory
...
update TestRunWithKernelMemory
Upstream-commit: f2db5028cd5b74afc856fd303e9450e50975f93a
Component: engine
2015-09-24 11:10:51 -07:00
Arnaud Porterie
9180d03f46
Merge pull request #16556 from Microsoft/10662-randomunix
...
Make 'TestRandomUnixTmpDirPath' platform agnostic
Upstream-commit: de8b5c46ccabf00ce869d3b2a526c32d044653a7
Component: engine
2015-09-24 10:35:27 -07:00
David Calavera
426a4c8843
Merge pull request #16541 from sunyuan3/newlogformat
...
Update documentation for new test log format
Upstream-commit: f75206dd7b4f3cb91399a0f465c096402d89eb50
Component: engine
2015-09-24 10:07:20 -07:00
Doug Davis
a894b3819f
Merge pull request #16545 from HuKeping/fixtest
...
Fix test for container events
Upstream-commit: 1e514de2e413fb01ceac36fa222a4334b854991d
Component: engine
2015-09-24 12:43:51 -04:00
John Howard
b5fd27f53c
TestRandomUnixTmpDirPath platform agnostic
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5d630abbab734d60cc3078fd1e94862a67e0d8fd
Component: engine
2015-09-24 09:37:07 -07:00
Hu Keping
fcffa49e7d
Fix test for container events
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 5505bcdd628de4a45781609bdc10d203aab77834
Component: engine
2015-09-24 19:04:54 +08:00
Jess Frazelle
3a638e5279
Merge pull request #16190 from LK4D4/drain_refactor
...
Refactoring of bufReader
Upstream-commit: 8c33c6c737c887f05c0dfc1eb7f1002d16250f69
Component: engine
2015-09-24 01:54:40 -07:00
Kun Zhang
d9099289b8
test neat
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
Upstream-commit: 029c6eacd6fa2970b5a8dea0acc0deecf1efbf5b
Component: engine
2015-09-24 10:55:47 +08:00
Brian Goff
faecb581fa
Merge pull request #15021 from chenchun/resize_pool
...
Try to resize data and metadata loopback file when initiating devicemapper
Upstream-commit: 22877e1b165337a84629f5e513f69007e01a9c8e
Component: engine
2015-09-23 22:22:51 -04:00
Yuan Sun
c78406d3a6
Update documentation for new test log format.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 6fe38e3947c0e744c4f6c48956044fc99a577806
Component: engine
2015-09-24 09:47:42 +08:00
Chun Chen
87c29288c8
Try to resize data and metadata loopback file when initiating devicemapper
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: 2458452a3b96d0e6f6dfa44d7c30585db83c2fd1
Component: engine
2015-09-24 09:31:00 +08:00
Brian Goff
8316b128fe
Merge pull request #16411 from duglin/DaemonErrors
...
Move more 'daemon' errors to the new error package
Upstream-commit: ebe7ef9fc2238f008101f31c0c405cbc460ab757
Component: engine
2015-09-23 21:20:56 -04:00
Brian Goff
4422b77499
Merge pull request #16415 from HuKeping/dockerinfo
...
Format output of docker info
Upstream-commit: 40e856041265d6030768286f1b228f042c0f768b
Component: engine
2015-09-23 21:15:23 -04:00
David Calavera
6f6bded2f0
Merge pull request #16540 from MHBauer/man-build-arg
...
fix typo in man page
Upstream-commit: a51861226058299e0e504f5b512f0f9e2b4c6fb3
Component: engine
2015-09-23 17:51:09 -07:00
Morgan Bauer
4662d89886
fix typo in man page
...
- resolve #16536
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 3a4775cb8003324d9aed5bfbe23f58eb0ca5bb41
Component: engine
2015-09-23 17:41:52 -07:00
Yuan Sun
9ea32924b5
update TestRunWithKernelMemory
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: b89fdc120e188f8041c51c72963a9aa911ed0f99
Component: engine
2015-09-24 08:41:35 +08:00
Tonis Tiigi
be78ccc6cf
Make bytesPipe use linear allocations
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c5b23337c37f0bcf01a7bf6a5129c326df136396
Component: engine
2015-09-23 17:12:54 -07:00
Jess Frazelle
1547f964d2
Merge pull request #16497 from MHBauer/attach-refactor-new
...
refactor attach to not use internal data structures
Upstream-commit: ddd0c47412dd30f1d333b5bd53e22c9949d1e86f
Component: engine
2015-09-23 16:52:39 -07:00
Jess Frazelle
9890a83a8f
Merge pull request #16484 from HuKeping/history-format
...
Format the output of docker history
Upstream-commit: d71ae4577293e6600447433126f4034d80d85ddb
Component: engine
2015-09-23 16:52:21 -07:00
Darren Stahl
d675aaa69f
Windows: Fixed escaping of command line arguments
...
This fixes some tests that were failing on windows
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ca5cc770b9f0d473b285f55eb78d507a8669ee41
Component: engine
2015-09-23 16:35:44 -07:00
Alexandre Beslic
a59918e10b
Merge pull request #16494 from calavera/fix_plugin_url_scheme
...
Do not hardcode http as plugin URL scheme for secure connections.
Upstream-commit: a1573dffee45b8205ee589cbb0ed01e476eed529
Component: engine
2015-09-23 16:18:00 -07:00
Tibor Vass
86820306dc
Merge pull request #16504 from brahmaroutu/ImageErrors
...
Adding error codes to image package
Upstream-commit: 793a40908155c87435e676646a23a413616dda6d
Component: engine
2015-09-23 19:15:25 -04:00
Alexander Morozov
f73d781736
Refactor bufReader to use BytesPipe
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 56b70bf84e253bfedef94248a0b6b1f8d730091c
Component: engine
2015-09-23 16:00:28 -07:00
Alexander Morozov
1c8652eb77
Add BytesPipe datastructure to ioutils
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 24310b5b4ab600ab5cb046d2f2ceaaa086b30be3
Component: engine
2015-09-23 16:00:27 -07:00
Tibor Vass
abf8c0902a
Merge pull request #16517 from coolljt0725/show_help_all_the_time
...
Clean up: show usage when global --help present
Upstream-commit: 01670bec48e3302c3571e7369e57fa0f092bbdf2
Component: engine
2015-09-23 18:58:19 -04:00
Jess Frazelle
74d32ea342
Merge pull request #16371 from coolljt0725/docs_update_contributing
...
Docs: update the CONTRIBUTING.md
Upstream-commit: 323c77e4e18b7e5aefe0dbc5b44d913dee057011
Component: engine
2015-09-23 15:56:13 -07:00
Jess Frazelle
845a2f5351
Merge pull request #16500 from sergeyevstifeev/11584-pkg-stdcopy-test-coverage
...
Adding some more coverage to StdCopy to address #11584
Upstream-commit: 04b171a6328d20ad4d6cbe1554aa53f189634178
Component: engine
2015-09-23 15:51:21 -07:00
Jess Frazelle
132d2c125d
Merge pull request #16502 from Microsoft/10662-cpuweight
...
Windows: [TP4] Add CPU Weight
Upstream-commit: 51fad49e673900fd6c10d86e6a21dfc2f3f0b40f
Component: engine
2015-09-23 15:41:35 -07:00
Jess Frazelle
24584ca8a3
Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp
...
Docs: correct the description of docker cp
Upstream-commit: a077c46d140ade9b78d81c66fe4b752e6ea25f13
Component: engine
2015-09-23 15:40:58 -07:00
Jess Frazelle
d8d1fffffc
Merge pull request #16528 from gesellix/docs-container-commit
...
fix content-type of response for `/commit`
Upstream-commit: 40adb3fd2cd6a10faa44bbd49a9364e2d71cefe9
Component: engine
2015-09-23 15:38:38 -07:00
Jess Frazelle
4429613429
Merge pull request #16289 from cpuguy83/11957_fix_stdin_block_after_container_exit
...
Ensure stdin does not block after container stop
Upstream-commit: c0c941627a2a516ce540aac2d9e3d579baa3efde
Component: engine
2015-09-23 15:29:48 -07:00
Jess Frazelle
a5a5293d43
Merge pull request #16346 from cpswan/fixes-15792
...
Clarify when keys are created
Upstream-commit: 871daf5498b4211a23ca5150444ed713d8cfd1d7
Component: engine
2015-09-23 15:29:06 -07:00
Jess Frazelle
2ec677ecb1
Merge pull request #16518 from unclejack/bump_go_to_1.4.3
...
Dockerfile: bump Go to 1.4.3
Upstream-commit: 200fa6978c7e529ba837ee81e2cd1c926ead0966
Component: engine
2015-09-23 15:21:06 -07:00
Tobias Gesellchen
a505c19468
fix content-type of response for /commit
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 78de066a28c5e01524401840ff4d1ae76e8e0fc2
Component: engine
2015-09-23 23:49:16 +02:00
Tibor Vass
72d0228543
Merge pull request #15915 from sdurrheimer/master
...
Zsh completion updates
Upstream-commit: 8d69e0eae06a741c8887af12d09461e89b950515
Component: engine
2015-09-23 17:20:34 -04:00
Jess Frazelle
9e47501dca
Merge pull request #16525 from icecrime/fix_integration_cli
...
Fix integration cli
Upstream-commit: 8f8cc077d35fc053c394f420955297bb36cfa3e0
Component: engine
2015-09-23 13:52:28 -07:00
Jess Frazelle
97e65cfb4f
Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-boot
...
Do not try to guess "docker" in Debian SysV init script
Upstream-commit: ce092ed08e9fb762d76501e9b99c132142bdaf6b
Component: engine
2015-09-23 13:46:19 -07:00
Arnaud Porterie
90fabf5056
Skip TestAppArmorDeniesChmodProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 04e1015aa06785210dc6a3e4d4ad66700a8d51b0
Component: engine
2015-09-23 13:23:15 -07:00
Arnaud Porterie
64940b5f4a
Skip TestRunUnshareProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 03dce24137c82caa04c215d983eac06a3edc084c
Component: engine
2015-09-23 13:23:08 -07:00
moxiegirl
239fd6e7ef
Merge pull request #16503 from carolfh/image-mag
...
Image mag
Upstream-commit: ec4b71b64a1307916ec9a0d17460077798390470
Component: engine
2015-09-23 12:43:20 -07:00
Tibor Vass
f079e61160
Merge pull request #16493 from cpuguy83/doc_plugin_rpcgen
...
Add README for pluginrpc-gen
Upstream-commit: 8f7f0f8deb95804eef95b572c53721ea1d0199d9
Component: engine
2015-09-23 15:36:05 -04:00
Carol Fager-Higgins
e2a6738cd5
fixed jira DTR-1173 typo in link and additional edits
...
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com >
Upstream-commit: 3e6991f35c6b98f3503cc81f166420645e7d3c9e
Component: engine
2015-09-23 12:33:45 -07:00
Jess Frazelle
e4f6d7ad34
Merge pull request #16522 from jfrazelle/zypper-wtaf
...
fix zypper wrt interactive
Upstream-commit: 70016198ce84e545bd155627d179a8d65b7fb7f6
Component: engine
2015-09-23 10:30:58 -07:00
Srini Brahmaroutu
71a51a6ff7
Adding error codes to image package
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: da0ca83377db0228db82b7be4096b34e3ebfb114
Component: engine
2015-09-23 17:03:37 +00:00
Doug Davis
5ee0f81315
Move more 'daemon' errors to the new error package
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0a734182eb09497806a9ff3e1c8031ab1ab39f13
Component: engine
2015-09-23 09:51:45 -07:00
David Calavera
d75894fcf6
Improvements to the original sharing implementation.
...
- Print the mount table as in /proc/self/mountinfo
- Do not exit prematurely when one of the ipc mounts doesn't exist.
- Do not exit prematurely when one of the ipc mounts cannot be unmounted.
- Add a unit test to see if the cleanup really works.
- Use syscall.MNT_DETACH to cleanup mounts after a crash.
- Unmount IPC mounts when the daemon unregisters an old running container.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: b1d2f52bb2bb900cddb526320b13da18634fe518
Component: engine
2015-09-23 12:07:24 -04:00
Morgan Bauer
65ae094a39
refactor attach to not use internal data structures
...
- refactor to make it easier to split the api in the future
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 8aef1a33eb730a7c9b7e92b688bc63e6a3c69f62
Component: engine
2015-09-23 08:55:21 -07:00