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
bfc68d10ed
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
2015-04-10 11:10:26 -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
5037297388
cp: add support for copy filename with ":"
...
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-04-10 00:08:05 -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
3cb751906a
Remove Job from `docker kill`
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-04-09 16:06:54 -07:00
e290a22dc9
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-10 00:56:43 +02:00
eebfcde0ea
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
2015-04-09 15:09:48 -07:00
8ad6031759
Merge pull request #12162 from daviddavis/README
...
Fixing up the README
2015-04-09 14:26:03 -07:00
e4addf1c01
Docs cleanup - Contributor Guide
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
2015-04-09 14:20:03 -07:00
67676529b3
Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge
...
Remove jobs from daemon/networkdriver/bridge
2015-04-09 14:10:21 -07:00
d66f868a83
Merge pull request #12247 from LK4D4/copy_no_engine
...
Removed engine from /copy
2015-04-09 14:09:00 -07:00
5ccb1c764b
Remove job from pause/unpause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 22:50:48 +02:00
dd4389fb19
Merge pull request #12109 from runcom/11625-fix-windows-test-build-cancellation
...
Fix TestBuildCancelationKillsSleep to not fail on Windows
2015-04-09 13:33:27 -07:00
ccdef895de
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-04-09 13:05:31 -07:00
d38c90140b
Fix TestBuildCancelationKillsSleep to not fail on Windows
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-04-09 21:03:19 +02:00
6fb8bd0450
Merge pull request #12244 from calavera/fix_typo_in_dispatcher
...
Fix typo in builder/dispatchers.go
2015-04-09 11:51:43 -07:00
bbdf045ac1
Fix typo in builder/dispatchers.go
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-04-09 11:43:05 -07:00
b02cf5239e
Merge pull request #12115 from cpuguy83/fix_events_filter_test
...
Cleanup events filter by container test
2015-04-09 11:40:08 -07:00
c77ac8e29d
Merge pull request #12225 from chenhanxiao/commit-accent
...
docs: add missing accent mark around docker command
2015-04-09 11:34:07 -07:00
94fcded51b
Merge pull request #12208 from twhiteman/master
...
fix #12188 integration-cli: use "top" instead of "sleep" to avoid timeout
2015-04-09 14:30:43 -04:00
fa961ce046
Wrap installer in a function
...
This will assure that the install script will not
begin executing until after it has been downloaded should
it be utilized in a 'curl | bash' workflow.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-04-09 14:26:07 -04:00
92a775bd7a
Merge pull request #12234 from runcom/remove-job-rmi
...
Remove job from rmi
2015-04-09 11:24:20 -07:00
3218f3936d
Merge pull request #12197 from runcom/remove-job-rm
...
Remove job from rm
2015-04-09 11:21:52 -07:00
Tibor Vass
Brian Goff
root
Vincent Batts
Doug Davis
moxiegirl
Antonio Murdaca
Phil Estes
Michael Crosby
Megan Kostick
Arnaud Porterie
Raghuram Devarakonda
Yan Feng
Hu Keping
Chen Hanxiao
Tibor Vass
David Young
Tianon Gravi
Alexander Morozov
Doug Davis
Yuan Sun
WiseTrem
Alexander Morozov
David Calavera
Jessie Frazelle
Eric Windisch