0118377dec
Merge pull request #12313 from runcom/remove-job-export
...
Remove job from export
Upstream-commit: a4f98d32258b8e209ab2702f0d0a092a7ffe15a2
Component: engine
2015-04-13 11:57:55 -04:00
416e9ff40b
Merge pull request #12304 from runcom/remove-job-logs
...
Remove job from logs
Upstream-commit: bfb487dc50e3b88b520678a9118bfb95891140cb
Component: engine
2015-04-13 08:38:46 -07:00
4d5d362d48
Merge pull request #12314 from runcom/remove-engine-links
...
Remove engine from links
Upstream-commit: 9c48f6d9a5fd7e321b3fa7b885fdb80d84609520
Component: engine
2015-04-13 11:27:13 -04:00
fb91cdcdf3
Merge pull request #12326 from xiaods/issure-12316
...
correct pkg/stdcopy NewStdWriter function comments
Upstream-commit: 871f4cdccbb39f59c383c96cd2db49ab1850635f
Component: engine
2015-04-13 09:39:34 -04:00
ebe83bc94c
Remove job from export
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6b737752e342e30dd20417b18c92c9b4e1c4f8da
Component: engine
2015-04-13 15:27:45 +02:00
a1302c340a
Merge pull request #12321 from HuKeping/testcase_typo
...
Fix typo in testcase
Upstream-commit: ad41ba1f954a19327534e9d66de674bce79622d8
Component: engine
2015-04-13 08:48:41 -04:00
0d56f45991
Fix typo in testcase
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 1567cf2cdf07bcbafbb1555fd950f5c5ce7a1c66
Component: engine
2015-04-13 23:09:07 +08:00
34cad7f622
correct pkg/stdcopy NewStdWriter function comments
...
pkg/stdcopy NewStdWriter function has wrong doc comment,
utils is not correct, it should be stdcopy
Signed-off-by: Deshi Xiao <xiaods@gmail.com >
Upstream-commit: a715b0e31beabed9ac5702af2ede619b4232cbdb
Component: engine
2015-04-13 17:21:27 +08:00
b3c5a7d38d
Remove job from logs
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 91bfed604959c591a076c2e330cb3ded7443f504
Component: engine
2015-04-13 08:25:31 +02:00
b706b2d562
Remove engine from links
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7560018541192ebdfe16e39515f9a04b44635d84
Component: engine
2015-04-12 16:25:10 +02:00
6b4495dbae
Merge pull request #12305 from runcom/remove-job-exec-inspect
...
Remove job from execInspect
Upstream-commit: a54fd325e6bd0c5a1c298deef48399fe6e59aa33
Component: engine
2015-04-12 08:30:38 -04:00
58925e6041
Merge pull request #12306 from runcom/remove-job-stop
...
Remove job from stop
Upstream-commit: 395df2b0a5f9ad61246ddf84fe47249507878616
Component: engine
2015-04-12 08:29:22 -04:00
d05177503f
Remove job from stop
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 04cc6c6aa4f8ea656d23268b7bff0136e4fc6c8d
Component: engine
2015-04-12 00:41:16 +02:00
62d48e6c18
Remove job from execInspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 621ee1f6a4cbc8ee8758ce77a0cf6215c88f12f7
Component: engine
2015-04-12 00:15:34 +02:00
6fd02194d0
Merge pull request #12289 from sunyuan3/docker_remote_api
...
update docker_remote_api_v1.19.md
Upstream-commit: e3dd323336904c02aaf57a1ffe3dcc8cb666fc78
Component: engine
2015-04-11 09:27:36 -05:00
933c2653a0
Merge pull request #12288 from sunyuan3/ubuntu
...
update ubuntulinux.md
Upstream-commit: 6d8102466a2b6af569aaa4e12bb0c66b0ff3594a
Component: engine
2015-04-11 09:25:55 -05:00
dd126faafc
update docker_remote_api_v1.*
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 4f492e794ae9c9a51edae4bb5873187eadab828e
Component: engine
2015-04-11 18:11:49 +08:00
884d515118
Merge pull request #12290 from yuchangchun1/typo
...
Fix a typo in TestVolumesFromGetsProperMode
Upstream-commit: e3c1cc8d77ea4be7d9e2c0041590a9da7d6920f6
Component: engine
2015-04-10 23:45:42 -04:00
b7982a6499
Fix a typo in comment of parseMaybeJSONToList
...
Signed-off-by: Yu Changchun <yuchangchun1@huawei.com >
Upstream-commit: 24dd8a4698315a4aafee5071f4fe4d74fa06c377
Component: engine
2015-04-11 10:34:21 +08:00
cefc6ef8df
Merge pull request #11058 from x1022as/upstream-master
...
fix 'rmi -f imgID' problem
Upstream-commit: 5c3b228b61dbba3a7f4c7635537d610f18969429
Component: engine
2015-04-10 22:00:14 -04:00
d555f3e70e
'docker rmi -f IMAGE_ID' untag all names and delete the image
...
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:
*untag all names and delete the image
*add test to this feature
*modify commandline/cli.md to explain this
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 795a58fb44a2bd18ec37d78c82d75c025f786c50
Component: engine
2015-04-11 09:24:21 +08:00
7bfb104972
update ubuntulinux.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a8fddbdeae6dfb8f6366cc476b37c84ed49f2732
Component: engine
2015-04-11 08:58:23 +08:00
c6dc4ca317
Merge pull request #12274 from brahmaroutu/fix_gccgo_compilation
...
Unwanted declaration causing compilation issues with gccgo
Upstream-commit: 418195a4fb66d01e7fdf0ee236af3946fbe531b8
Component: engine
2015-04-10 20:22:45 -04:00
882b6484cb
Merge pull request #12283 from brendandixon/win-cli/wrapfix
...
Turned off Ctrl+C processing by Windows shell
Upstream-commit: d90da05b1b1033f9af2c4d5757f43a4d927a8245
Component: engine
2015-04-10 16:40:43 -07:00
9302157d91
Merge pull request #12272 from nathanleclaire/bots_are_our_friends
...
Allow SEO crawling from docs site
Upstream-commit: f3e1178791cf5e47ab90c4cdf701dae35b43554d
Component: engine
2015-04-10 15:58:37 -07:00
6607181ac9
Turned off Ctrl+C processing by Windows shell
...
Signed-off-by: Brendan Dixon <brendand@microsoft.com >
Upstream-commit: c337bfd2e0b0293dbca478a13c29a469493782eb
Component: engine
2015-04-10 15:43:35 -07:00
2ebe691b25
Allow SEO crawling from docs site
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com > (github: nathanleclaire)
Upstream-commit: de03f4797b614fb192a72c83812c2a04a1939c87
Component: engine
2015-04-10 15:29:55 -07:00
65951704ad
Merge pull request #12103 from sunyuan3/pause
...
add TestContainerApiPause case
Upstream-commit: 001a7e6babbc832cd07304c2c3ec2ed4b852abbd
Component: engine
2015-04-10 18:04:29 -04:00
f10bd173bd
Merge pull request #11478 from dmcgowan/v2-vendored-api
...
Use v2 api from distribution
Upstream-commit: 563041b5c4acaca8e6ebb8fb4e81a3e7e7c37e81
Component: engine
2015-04-10 17:22:38 -04:00
44fddcaf4b
Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required
...
devmapper: udev sync is a requirement
Upstream-commit: 23c12dabbdb7f895f606bbf2438599d29c53df3a
Component: engine
2015-04-10 16:52:38 -04:00
847b362ddd
Merge pull request #12250 from runcom/remove-job-wait
...
Remove job from wait
Upstream-commit: 96313f7ce0c10ab2d038d35066cf9134358afdc8
Component: engine
2015-04-10 16:27:59 -04:00
fd315b5f1a
Unwanted declaration causing compilation issues with gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 73d08528ea9b043cbe941b1219b1c55625c636a8
Component: engine
2015-04-10 19:47:15 +00:00
d89c51c3b5
devmapper: storage-opt override for udev sync
...
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.
Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.
Including link to the docs for users that encounter this daemon error
during an upgrade.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0e21782de5c038dfa3cfdfc7655b9e6b143baa7b
Component: engine
2015-04-10 15:43:16 -04:00
59aa4a9b9f
Merge pull request #12271 from kostickm/12119-rename-TestStartSilentAttach
...
Rename TestStartSilentAttach to TestStartAttachSilent
Upstream-commit: 6d8bba0cc88538be645b8e66867adc44cfe3f640
Component: engine
2015-04-10 12:20:37 -07:00
8c9e796ec1
Merge pull request #12218 from draghuram/apidoc_12055
...
Adds example request and Json parameter information for container
Upstream-commit: 6ab4878a015cecfc26426a9a9704ea04ac04666e
Component: engine
2015-04-10 11:22:57 -07:00
928371a2db
Remove job from wait
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: db0ffba3b92aeda667501aaa10926943a7738f82
Component: engine
2015-04-10 20:17:02 +02:00
0e5a10f3c6
Merge pull request #12242 from tianon/functionalize-install
...
Wrap install.sh in a function
Upstream-commit: 904295fd716b5f02cd58a510e88fdf2bdcc9cd6b
Component: engine
2015-04-10 14:15:38 -04:00
1f992e6c96
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
Upstream-commit: bae3273ef4e61fd04c0dd4ddb1527aa7c4f9bfb6
Component: engine
2015-04-10 10:56:01 -07:00
ff94291067
Merge pull request #12248 from duglin/RemoveJobKill
...
Remove Job from `docker kill`
Upstream-commit: 267bd51adbf9e344a5d18bb0c7df4e09bcb60668
Component: engine
2015-04-10 10:52:18 -07:00
6adf3865a5
Rename TestStartSilentAttach to TestStartAttachSilent
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: e7a2e2bf7e5adbbed0443cc99ab728d5118b3b7b
Component: engine
2015-04-10 10:45:38 -07:00
5f1006335a
Merge pull request #12238 from brendandixon/win-cli/fixes
...
Corrected int16 overflow and buffer sizes
Upstream-commit: 43aca9adac732f32bb04cc435a1bb58521fd9984
Component: engine
2015-04-10 13:36:23 -04:00
fdca34bdb1
Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
...
cli: Better wording for daemon --log-driver
Upstream-commit: 7cec5f50c51d91660c5b2ea2f4a9cf4dc6762b82
Component: engine
2015-04-10 08:29:29 -07:00
41fc757124
Adds example request and Json parameter information for container
...
start API.
Closes #10304 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 202e0380f36be93ace139cb52e6c4752d195a034
Component: engine
2015-04-10 11:10:41 -04:00
9aebeb40a8
Merge pull request #12260 from HuKeping/rmjob-history
...
Remove Job from History API
Upstream-commit: 0693e34d7ec65e0735b2f9b36e326a1ee7d6942e
Component: engine
2015-04-10 09:53:05 -04:00
fbe401b655
Remove Job from History API
...
a part of issue #12151
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 5c7c3fea6caf43d51344faaf190b869db1b44f46
Component: engine
2015-04-10 21:37:56 +08:00
613e921976
Merge pull request #12263 from chenhanxiao/typo-resize-test
...
api_resize_test: fix a typo
Upstream-commit: 5c8e28ec7c992149c3d60186a82d1abd4804b98e
Component: engine
2015-04-10 05:46:42 -07:00
7c9d740c01
api_resize_test: fix a typo
...
s/cintainer/container
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: 4ddc721f234ebb721b9540af3a9358da2f3e6e58
Component: engine
2015-04-10 03:09:26 -04:00
3c8b23939b
Merge pull request #12210 from tiborvass/carry-9916
...
Carry 9916: add comment column in docker history command
Upstream-commit: 296323cd6cd8e5864525c4c13ee1d835365a9512
Component: engine
2015-04-10 00:02:00 -04:00
5ed91523df
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fa2ace00a833492123f7db1e2f867f70bab89be4
Component: engine
2015-04-09 21:29:42 -04:00
3ee56a6e4d
Refine document by review comments
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
Upstream-commit: 8d682bf734539ade2d618349f82b8b5e83a87167
Component: engine
2015-04-09 21:29:42 -04:00
