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
c8f528f001
Merge pull request #12109 from runcom/11625-fix-windows-test-build-cancellation
...
Fix TestBuildCancelationKillsSleep to not fail on Windows
Upstream-commit: dd4389fb19e442d386c3106545f04387c08e6a91
Component: engine
2015-04-09 13:33:27 -07: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
8529d665c0
Merge pull request #12232 from ahmetalpbalkan/names/kilby-joyce
...
namesgenerator: Proposing Kilby/Noyce
Upstream-commit: 3ca46f29b86ecec256c857cdfddf39405d5fd67f
Component: engine
2015-04-09 11:25:19 -04: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
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
85a5c923c7
Removing unused getBoolParam func from api/server/server.go
...
Fix #12199
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com >
Upstream-commit: 0fc75a3136456621c074124819567816420f55bf
Component: engine
2015-04-09 09:13:16 +03:00
8bd8b0185d
Remove Job from docker images
...
Also removes engine.Table
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d045b9776b5dc16e12b3d7c7558a24cdc5d1aba7
Component: engine
2015-04-08 19:33:01 -07:00
ac0bbebed0
Show the right image name/ID in job log
...
When we tag an Image with several names and we run one of them,
The "create" job will log this event with
+job log(create, containerID, Imagename).
And the "Imagename" is always the first one (sorted). It is the
same to "start/stop/rm" jobs. So use the correct name instand.
This PR refer to #10479
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
Upstream-commit: 663d9130118548c648c4463bae088fd983099e08
Component: engine
2015-04-09 09:41:23 +08:00
0e9f46311c
execdriver/lxc: use local rand.Random in test
...
Preventing the test execution to pollute the deterministic runtime environment
by seeding the global rand.Random.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: c2c45d77691d1ca501a68d20885d040415477c92
Component: engine
2015-04-08 18:13:07 -07:00
f60fa17571
Merge pull request #12206 from jfrazelle/11966-fix-racy-tests-on-overlay
...
cleanup/fix integration-cli for overlay in overlay
Upstream-commit: 91abff41dda96244ee3e4ae47e7c37c5067657a7
Component: engine
2015-04-08 20:52:58 -04:00
0d1c1d0efa
cleanup/fix integration-cli for overlay in overlay
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 255b84444a86201995d8f688d71b83822f146c3e
Component: engine
2015-04-08 16:59:36 -07:00
a981a686fa
docs: Markdown format fix around LogConfig param
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: b66597eef18a02014e0b634dc3dc55dff3de4c20
Component: engine
2015-04-08 16:16:37 -07:00
0c091d906f
Remove jobs from daemon/networkdriver/bridge
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 53582321ee502335a9c3be4789bef984e09f77c4
Component: engine
2015-04-08 18:50:29 -04:00
58278c5226
Merge pull request #12163 from duglin/RemoveJobPS
...
Remove Job from PS API
Upstream-commit: 7233bd223d4760af604e619a06c2c9ffe3fa1e22
Component: engine
2015-04-08 13:43:47 -07:00
113cc5ab8c
Merge pull request #12194 from icecrime/update_maintainers
...
Drop shin from MAINTAINERS
Upstream-commit: 56a2c587605088e31166eb65ad59f5804b52d211
Component: engine
2015-04-08 13:43:01 -07:00
cddae8691d
Merge pull request #12171 from cstivers78/patch-1
...
Proposing Seymour Cray
Upstream-commit: 66a68e378c4b47bcd698b2053ebf04a27546bd22
Component: engine
2015-04-08 13:42:13 -07:00
c31e88ed52
Drop shin from MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: d0c1fba73edfe502d216cb4537036c92137bdb92
Component: engine
2015-04-08 13:31:42 -07:00
7eb558ca75
Proposing Seymour Cray
...
Signed-off-by: Chris Stivers <chris@stivers.us >
Upstream-commit: 5206f76f44f3a55e52d3c0878b0ec780484595c0
Component: engine
2015-04-08 13:17:22 -07:00
1458b613cf
Merge pull request #12191 from kostickm/12189-fix-json-tags
...
Fixing JSON Tags
Upstream-commit: 776b7e855959b82a53c715c9b86dd583939dcba4
Component: engine
2015-04-08 13:11:54 -07:00
86f7d2f063
Merge pull request #12187 from moxiegirl/docs-makefile-update
...
Adding environment variables for sub projects
Upstream-commit: 57536d82e797cde90bf49e09771cc6f489cc766e
Component: engine
2015-04-08 12:48:09 -07:00
c4fa112c81
Adding environment variables for sub projects
...
Fixes issue #12186
Fixing variables per Jess
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ef8b917fac0b3d98146cadd890234d9179ae2021
Component: engine
2015-04-08 12:23:50 -07:00
584caa6937
Fixing JSON Tags
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: 88119bb276aec5a5b5fd271a2ef6ebd8ad0fa042
Component: engine
2015-04-08 12:05:12 -07:00
