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
3f75ea937e
Only use fallback to short IDs when obvious.
...
As reported in #11294 , the Docker daemon will execute contains it
shouldn't run in the event that a requested tag is present in an image's
ID. This leads to the wrong image being started up silently.
This change reduces the risk of such a collision by using the short ID
iff the actual revOrTag looks like a short ID (not that it necessarily
is).
Signed-off-by: Richard Burnison <rburnison@ebay.com >
Upstream-commit: 8d1a500303a9dd892301e343c94821207c715fbb
Component: engine
2015-04-10 13:20:44 -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
10d36e87f8
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 >
Upstream-commit: bfc68d10ed778bc0c2e2caedb80b65bd961c76b0
Component: engine
2015-04-10 11:10:26 -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
88ea73a6aa
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 >
Upstream-commit: 50372973884d96ee115094336ed1952b1e71250a
Component: engine
2015-04-10 00:08:05 -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
807d6f107a
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
Upstream-commit: bf57339527f153b502a6443a495824a40768e39f
Component: engine
2015-04-09 21:29:41 -04:00
cb92c33b81
Commonalize more bits of install.sh (especially standardizing around "cat <<-EOF")
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 6842bba163de753a5ff3ddbaf9b408c89235022b
Component: engine
2015-04-09 19:28:25 -06:00
9acc2a6359
Merge pull request #12256 from WiseTrem/remove_go1.2
...
Remove pools_nopool.go & build tag from pools.go
Upstream-commit: e690ad92925a045344bde8d2d59d7a7f602dded6
Component: engine
2015-04-09 18:25:09 -07:00
681bfa410b
Remove Job from docker top
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 3e096cb9c9e9d708df7982be5694daaa62bb4849
Component: engine
2015-04-09 18:17:50 -07:00
cbe9a536c0
add TestContainerApiPause case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 8636a219911536123decb547dab9bf50ebb2c8f8
Component: engine
2015-04-10 09:14:01 +08:00
b506e8e25b
Merge pull request #12254 from runcom/remove-job-resize-execresize
...
Remove job from resize&execResize
Upstream-commit: 404f81011b23f6376c2d8e5d5f0bebc3ca5a7603
Component: engine
2015-04-09 17:00:58 -07:00
cb45c12af0
Merge pull request #12252 from kostickm/update-contributor-guide-docs
...
Docs cleanup - Contributor Guide
Upstream-commit: 02f6d7f98a1444496815ffcf59a20bee562d2d12
Component: engine
2015-04-09 16:54:08 -07:00
d243477d0e
Remove pools_nopool.go & build tag from pools.go
...
Fix #11576
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com >
Upstream-commit: f01d755cd0af7b17596cc084871f7f032995cac3
Component: engine
2015-04-10 02:32:55 +03:00
4ef2fa0ccf
Remove Job from docker kill
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 3cb751906a8a0397dcf57d8fca97c0e9c0c418e8
Component: engine
2015-04-09 16:06:54 -07:00
7e0beddb7a
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e290a22dc935c2472e08be7362b7d3b0f6303615
Component: engine
2015-04-10 00:56:43 +02:00
49e1965bf2
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
Upstream-commit: eebfcde0ea459bc9100ddde4b3c4e13a06a472cc
Component: engine
2015-04-09 15:09:48 -07:00
a1c367ddb9
Merge pull request #12162 from daviddavis/README
...
Fixing up the README
Upstream-commit: 8ad603175905df79a8d1a99298525e2aaf5cd787
Component: engine
2015-04-09 14:26:03 -07:00
3054fd5405
Docs cleanup - Contributor Guide
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: e4addf1c016dd4b6510e17e3f0d23032f880ba6f
Component: engine
2015-04-09 14:20:03 -07:00
bdab727fe0
Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge
...
Remove jobs from daemon/networkdriver/bridge
Upstream-commit: 67676529b373c39c239ff7c8f4a374ae97659523
Component: engine
2015-04-09 14:10:21 -07:00
df6a964733
Merge pull request #12247 from LK4D4/copy_no_engine
...
Removed engine from /copy
Upstream-commit: d66f868a833d47d113d8750e6f3016429cad8f56
Component: engine
2015-04-09 14:09:00 -07:00
f7db80586a
Remove job from pause/unpause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 5ccb1c764b04449811aa4d8095a9ee609b901cf7
Component: engine
2015-04-09 22:50:48 +02:00
1164c8a3e0
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ccdef895def5e42706e792b4891ad2d06bbf488a
Component: engine
2015-04-09 13:05:31 -07:00
e7731ac431
Fix TestBuildCancelationKillsSleep to not fail on Windows
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d38c90140b8330bd355c40a0c8d1e9bd2b3664ec
Component: engine
2015-04-09 21:03:19 +02:00
70e9377023
Merge pull request #12244 from calavera/fix_typo_in_dispatcher
...
Fix typo in builder/dispatchers.go
Upstream-commit: 6fb8bd045067ffd72ec8c84306ec79ae1e10696a
Component: engine
2015-04-09 11:51:43 -07:00
95c63c4203
Fix typo in builder/dispatchers.go
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: bbdf045ac1dfa8fc78b1c932736fe6400eecdf63
Component: engine
2015-04-09 11:43:05 -07:00
146dc925a6
Merge pull request #12115 from cpuguy83/fix_events_filter_test
...
Cleanup events filter by container test
Upstream-commit: b02cf5239eedc9cddac5a331c97183dc53c1e8ef
Component: engine
2015-04-09 11:40:08 -07:00
06d2c99583
Merge pull request #12225 from chenhanxiao/commit-accent
...
docs: add missing accent mark around docker command
Upstream-commit: c77ac8e29dab500f00831e72949648004fcd4d74
Component: engine
2015-04-09 11:34:07 -07:00
88dff76815
Merge pull request #12208 from twhiteman/master
...
fix #12188 integration-cli: use "top" instead of "sleep" to avoid timeout
Upstream-commit: 94fcded51b6899b12b2827f5a5ee35259a63f2de
Component: engine
2015-04-09 14:30:43 -04:00
238dec85fd
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 >
Upstream-commit: fa961ce0463ebd738da875c3a6da8171373d7723
Component: engine
2015-04-09 14:26:07 -04:00
6ece2fa7f9
Merge pull request #12234 from runcom/remove-job-rmi
...
Remove job from rmi
Upstream-commit: 92a775bd7a8a379d92a83cc49bd78ec74d7c126d
Component: engine
2015-04-09 11:24:20 -07:00
f97c21daca
Merge pull request #12197 from runcom/remove-job-rm
...
Remove job from rm
Upstream-commit: 3218f3936dda688ef7bee0b196895d00284d7538
Component: engine
2015-04-09 11:21:52 -07:00
cb9c496f89
fix #12188 integration-cli: tests using "sleep" can timeout too early - change to "top" instead
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
Upstream-commit: 42d47c31367d288c7a9ae3acff635e995254469c
Component: engine
2015-04-09 10:46:57 -07:00
b19229f86e
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e4afc379dcee66475f3becb34cd2675f3ee9279c
Component: engine
2015-04-09 19:39:14 +02:00
a951b20a73
Merge pull request #12240 from LK4D4/fix_attach
...
Fix regressions in attach
Upstream-commit: 2052d01b1e52a4b1fa79fdc73c52a7b52f6d88a7
Component: engine
2015-04-09 13:34:18 -04:00
78df6ff4a0
Merge pull request #11895 from liusdu/m
...
show the right image name in job log and docker ps
Upstream-commit: 2b96bd0bb82ce2344c94485ef1d6c4d43416a187
Component: engine
2015-04-09 10:21:07 -07:00
ea52df6141
Fix regressions in attach
...
* Wrong bool parsing
* Attach always all streams
Were introduced in #12120
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0fec3e19dbff15b3cd8fa3693f694e34d8dcc5a9
Component: engine
2015-04-09 09:58:44 -07:00
601b29bbae
Remove job from rm
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: db13cb7f98a30169311cf2e4a80867a94f49d377
Component: engine
2015-04-09 18:46:24 +02:00
66b2b6199d
Merge pull request #12215 from ahmetalpbalkan/execdriver/localrand
...
execdriver/lxc: use local rand.Random in test
Upstream-commit: 6b7e520aa3effadc7a08cd82bcff29a4a53f580c
Component: engine
2015-04-09 12:22:25 -04:00
c900c31960
Merge pull request #12184 from duglin/RemoveJobImages
...
Remove Job from `docker images`
Upstream-commit: 6ba7bf440ee1604486015f421456668d00e795a2
Component: engine
2015-04-09 09:19:09 -07:00
d345a7781a
Merge pull request #12205 from ahmetalpbalkan/docs/remote-api-LogConfig-format
...
docs: Markdown format fix around LogConfig param
Upstream-commit: f16d8db78929e1dc479d2f8d6d8df995b91034f4
Component: engine
2015-04-09 09:17:24 -07:00
