ad41ba1f95
Merge pull request #12321 from HuKeping/testcase_typo
...
Fix typo in testcase
2015-04-13 08:48:41 -04:00
1567cf2cdf
Fix typo in testcase
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-13 23:09:07 +08:00
a54fd325e6
Merge pull request #12305 from runcom/remove-job-exec-inspect
...
Remove job from execInspect
2015-04-12 08:30:38 -04:00
395df2b0a5
Merge pull request #12306 from runcom/remove-job-stop
...
Remove job from stop
2015-04-12 08:29:22 -04:00
04cc6c6aa4
Remove job from stop
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 00:41:16 +02:00
621ee1f6a4
Remove job from execInspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-12 00:15:34 +02:00
e3dd323336
Merge pull request #12289 from sunyuan3/docker_remote_api
...
update docker_remote_api_v1.19.md
2015-04-11 09:27:36 -05:00
6d8102466a
Merge pull request #12288 from sunyuan3/ubuntu
...
update ubuntulinux.md
2015-04-11 09:25:55 -05:00
4f492e794a
update docker_remote_api_v1.*
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-11 18:11:49 +08:00
e3c1cc8d77
Merge pull request #12290 from yuchangchun1/typo
...
Fix a typo in TestVolumesFromGetsProperMode
2015-04-10 23:45:42 -04:00
24dd8a4698
Fix a typo in comment of parseMaybeJSONToList
...
Signed-off-by: Yu Changchun <yuchangchun1@huawei.com>
2015-04-11 10:34:21 +08:00
5c3b228b61
Merge pull request #11058 from x1022as/upstream-master
...
fix 'rmi -f imgID' problem
2015-04-10 22:00:14 -04:00
795a58fb44
'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>
2015-04-11 09:24:21 +08:00
a8fddbdeae
update ubuntulinux.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-11 08:58:23 +08:00
418195a4fb
Merge pull request #12274 from brahmaroutu/fix_gccgo_compilation
...
Unwanted declaration causing compilation issues with gccgo
2015-04-10 20:22:45 -04:00
d90da05b1b
Merge pull request #12283 from brendandixon/win-cli/wrapfix
...
Turned off Ctrl+C processing by Windows shell
2015-04-10 16:40:43 -07:00
f3e1178791
Merge pull request #12272 from nathanleclaire/bots_are_our_friends
...
Allow SEO crawling from docs site
2015-04-10 15:58:37 -07:00
c337bfd2e0
Turned off Ctrl+C processing by Windows shell
...
Signed-off-by: Brendan Dixon <brendand@microsoft.com>
2015-04-10 15:43:35 -07:00
de03f4797b
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)
2015-04-10 15:29:55 -07:00
001a7e6bab
Merge pull request #12103 from sunyuan3/pause
...
add TestContainerApiPause case
2015-04-10 18:04:29 -04:00
563041b5c4
Merge pull request #11478 from dmcgowan/v2-vendored-api
...
Use v2 api from distribution
2015-04-10 17:22:38 -04:00
23c12dabbd
Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required
...
devmapper: udev sync is a requirement
2015-04-10 16:52:38 -04:00
96313f7ce0
Merge pull request #12250 from runcom/remove-job-wait
...
Remove job from wait
2015-04-10 16:27:59 -04:00
73d08528ea
Unwanted declaration causing compilation issues with gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-04-10 19:47:15 +00:00
0e21782de5
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>
2015-04-10 15:43:16 -04:00
6d8bba0cc8
Merge pull request #12271 from kostickm/12119-rename-TestStartSilentAttach
...
Rename TestStartSilentAttach to TestStartAttachSilent
2015-04-10 12:20:37 -07:00
6ab4878a01
Merge pull request #12218 from draghuram/apidoc_12055
...
Adds example request and Json parameter information for container
2015-04-10 11:22:57 -07:00
db0ffba3b9
Remove job from wait
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 20:17:02 +02:00
904295fd71
Merge pull request #12242 from tianon/functionalize-install
...
Wrap install.sh in a function
2015-04-10 14:15:38 -04:00
bae3273ef4
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
2015-04-10 10:56:01 -07:00
267bd51adb
Merge pull request #12248 from duglin/RemoveJobKill
...
Remove Job from `docker kill`
2015-04-10 10:52:18 -07:00
e7a2e2bf7e
Rename TestStartSilentAttach to TestStartAttachSilent
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-10 10:45:38 -07:00
43aca9adac
Merge pull request #12238 from brendandixon/win-cli/fixes
...
Corrected int16 overflow and buffer sizes
2015-04-10 13:36:23 -04:00
7cec5f50c5
Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
...
cli: Better wording for daemon --log-driver
2015-04-10 08:29:29 -07:00
202e0380f3
Adds example request and Json parameter information for container
...
start API.
Closes #10304 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-04-10 11:10:41 -04:00
0693e34d7e
Merge pull request #12260 from HuKeping/rmjob-history
...
Remove Job from History API
2015-04-10 09:53:05 -04:00
5c7c3fea6c
Remove Job from History API
...
a part of issue #12151
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-04-10 21:37:56 +08:00
5c8e28ec7c
Merge pull request #12263 from chenhanxiao/typo-resize-test
...
api_resize_test: fix a typo
2015-04-10 05:46:42 -07:00
4ddc721f23
api_resize_test: fix a typo
...
s/cintainer/container
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-04-10 03:09:26 -04:00
296323cd6c
Merge pull request #12210 from tiborvass/carry-9916
...
Carry 9916: add comment column in docker history command
2015-04-10 00:02:00 -04:00
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-04-09 21:29:42 -04:00
8d682bf734
Refine document by review comments
...
Signed-off-by: David Young <yangboh@cn.ibm.com>
2015-04-09 21:29:42 -04:00
bf57339527
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com>
2015-04-09 21:29:41 -04:00
6842bba163
Commonalize more bits of install.sh (especially standardizing around "cat <<-EOF")
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-04-09 19:28:25 -06:00
e690ad9292
Merge pull request #12256 from WiseTrem/remove_go1.2
...
Remove pools_nopool.go & build tag from pools.go
2015-04-09 18:25:09 -07:00
3e096cb9c9
Remove Job from `docker top`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 18:17:50 -07:00
8636a21991
add TestContainerApiPause case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-04-10 09:14:01 +08:00
404f81011b
Merge pull request #12254 from runcom/remove-job-resize-execresize
...
Remove job from resize&execResize
2015-04-09 17:00:58 -07:00
02f6d7f98a
Merge pull request #12252 from kostickm/update-contributor-guide-docs
...
Docs cleanup - Contributor Guide
2015-04-09 16:54:08 -07:00
f01d755cd0
Remove pools_nopool.go & build tag from pools.go
...
Fix #11576
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
2015-04-10 02:32:55 +03:00
Doug Davis
Hu Keping
Antonio Murdaca
James Turnbull
Yuan Sun
Brian Goff
y00277921
Phil Estes
Deng Guangxing
Jessie Frazelle
moxiegirl
Brendan Dixon
Nathan LeClaire
Tibor Vass
root
Vincent Batts
Michael Crosby
Megan Kostick
Arnaud Porterie
Raghuram Devarakonda
Chen Hanxiao
Tibor Vass
David Young
Tianon Gravi
Alexander Morozov
Doug Davis
WiseTrem