5dd956e210
Get process list after PID 1 dead
...
Fix #11087
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ac8bd12b39d39a9361adc174bdff7837e771460d
Component: engine
2015-04-10 16:23:57 -07: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
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
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
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
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
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
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
898650d746
Merge pull request #12231 from ahmetalpbalkan/integ-cli/TestInfoEnsureSucceeds-all-required
...
cli_info_test: Check all required fields
Upstream-commit: 74b5c7b284c2794999aef1fae4a63e447d4d28de
Component: engine
2015-04-09 09:07:54 -07:00
4bf1025216
Merge pull request #12223 from YanFeng-Adam/typo
...
Fix a typo in docker/daemon/execdriver/native/exec.go
Upstream-commit: 7dff1c15d2b43fa05e296c7df302b2c11fc014c2
Component: engine
2015-04-09 11:49:02 -04:00
5ee2e5422a
Fix a typo in docker/daemon/execdriver/native/exec.go
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
Upstream-commit: ab11d605556749e56e9dc5b4b071375765ad60bf
Component: engine
2015-04-09 11:46:09 -04:00
0eb6cc5ff7
Merge pull request #12207 from WiseTrem/getBoolParam
...
Removing unused getBoolParam func from api/server/server.go
Upstream-commit: 8295bed3df0e92adfa784ed2564ba094202924d4
Component: engine
2015-04-09 08:28:48 -07:00
151e2df62b
Merge pull request #12227 from HuKeping/rm-rename
...
Remove Job from rename
Upstream-commit: 00fd22643015c030697b40d23e060bb482cf329b
Component: engine
2015-04-09 11:27:14 -04:00
16b268e23a
Remove Job from rename
...
A part of ISSUE#12151-Remove engine.Job mechanism
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 49c4de4aebe0ecc3005e56a9ab06b5e43f5b312c
Component: engine
2015-04-10 01:52:55 +08:00
adca7cca6d
fix up Image-name related issues in docker ps and CI
...
This patch include the following fixs:
- fix image name error when docker ps
- fix docker events test failure: use the exact image name for filter
- fix docker build CI test failure due to "docker events" change
Because of change of daemon log behavior. Now we record
the exact Image name as you typed. So docker run -d busybux sh
and docker run -d busybox:latest are not the same in the log.
So it will affect the docker events. So change the related CI
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
Upstream-commit: 645c020f5ab7119cd06d7c6a790e9d99fe1cd309
Component: engine
2015-04-09 23:03:23 +08:00
f3865d2e92
Cleanup events filter by container test
...
This also seemed to be checking the ordering of the events, which
doesn't seem like something we sould be interested in this particular
test.
Added check to make sure the filtered events have the expected ID's.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7e70998bb80d47e3f3a363fb49feaeaf50d64cbc
Component: engine
2015-04-09 09:47:58 -04:00
2be71420a6
namesgenerator: Proposing Kilby/Noyce
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 197ec4a6377373b4a0c2eaf90c9fde9cede2074b
Component: engine
2015-04-09 04:11:06 -07:00
73ef4f0ecf
cli_info_test: Check all required fields
...
`TestInfoEnsureSucceeds` is supposed to check existence of all
expected fields that are going to be shown in `docker info` command.
If this list was complete, it could have helped catching the missing
`"Logging Driver:"` regression.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 4c69d0dd8ade90b6602147b8dfb8c1f4c267d3bc
Component: engine
2015-04-09 04:01:39 -07:00
bc679a5419
cli: Better wording for daemon --log-driver
...
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.
Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: a4b7a9e1e5505983aea3f6d7e246c57a6f4f6170
Component: engine
2015-04-09 02:12:44 -07:00
a3cc1fb41c
docs: add missing accent mark around docker command
...
As we did everywhere.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: 809d99ad913fd73ae5da637c26f94879a6eb189c
Component: engine
2015-04-09 04:37:23 -04:00
