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
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
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
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
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
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
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
aa0ffa1114
Merge pull request #11855 from nfirvine/master
...
Add some new graphics for mac installation with boot2docker
Upstream-commit: 26e83832c7cdffcc6547972f10b3f8d85497fa85
Component: engine
2015-04-08 10:41:50 -07:00
b3b1e4936b
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 1bfa80bdd9ac05b01867492d2e6dda668aa7715c
Component: engine
2015-04-08 10:30:17 -07:00
eeb5b1ee1d
Merge pull request #12176 from YanFeng-Adam/typo
...
Fix a typo in /doc/sources/reference/run.md
Upstream-commit: ebc1e5ec9f25ba176bd30e08a26cb904d8009017
Component: engine
2015-04-08 10:08:05 -07:00
1ba10c92c9
Merge pull request #12178 from fschindler/fix-typo
...
Fixing typo.
Upstream-commit: b8a7fdade6351fc2201f8e7ca9b9416782852c4d
Component: engine
2015-04-08 09:10:53 -07:00
49086235ff
Merge pull request #12133 from xiaods/fixed-issue-11500
...
fixed #11500 Add tip about filter proxy
Upstream-commit: 254d6f7752dc325abe9e4a25fc80ab7887c72fde
Component: engine
2015-04-08 09:09:54 -07:00
dbd59d6d0d
Merge pull request #12168 from cpuguy83/remove_dup_file_creation
...
Remove duplicate config file creation.
Upstream-commit: a6d39e2a2de314be7f518a44df0505de8b6b65b4
Component: engine
2015-04-08 09:03:43 -07:00
c65fa515f2
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
Upstream-commit: 3ebfc99d1057d841c1cdd4f19e80fceea5ab380e
Component: engine
2015-04-08 08:29:24 -07:00
c745cf0be5
Fix a typo in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
Upstream-commit: 64fd944e30c8c045f6d998cc5ca950ea272541b5
Component: engine
2015-04-08 11:23:47 -04:00
97205a6be8
Merge pull request #12183 from runcom/remove-job-diff
...
Remove engine.Job from diff
Upstream-commit: 94ade35e4642bbb1579cc775b29ffdb7229819de
Component: engine
2015-04-08 08:21:43 -07:00
f3e1f81e2d
Remove engine.Job from diff
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e379e2668cecf8a0f9ef29eb57ee881f4d313d58
Component: engine
2015-04-08 15:52:10 +02:00
b29d9ea376
Fixing typo.
...
Added missing white space.
Signed-off-by: Felix Schindler <fschindler@weluse.de >
Upstream-commit: 8afd5cad317920cceed7536d278974d9251b0325
Component: engine
2015-04-08 11:03:11 +02:00
bc64528286
fixed #11500 Add tip about filter proxy
...
fixed #11500
Add tip about filter proxy to Docker installation Guides
Signed-off-by: Deshi Xiao <xiaods@gmail.com >
Upstream-commit: a40f37987859327c33643bb12067e3ece9e3294f
Component: engine
2015-04-08 14:13:01 +08:00
4c243c6e3e
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: cc30282e94546048a3957bdf360f99d4626e7d7c
Component: engine
2015-04-08 13:33:05 +08:00
6a5cd33722
Remove duplicate config file creation.
...
When `toDisk` is called, it is creating a file already, no need to
create it here.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 24057777af8dc9ee74574d1f5dd47bf6562161b5
Component: engine
2015-04-07 21:36:30 -04:00
42584d8cbb
Merge pull request #12161 from LK4D4/update_libcontainer
...
Update libcontainer
Upstream-commit: 06433cf812e26e468b9dcb6b0817f6597f1c397c
Component: engine
2015-04-07 16:18:33 -07:00
c5dd8466d2
Merge pull request #12160 from mrunalp/remove_unused
...
Removes unused function.
Upstream-commit: d08db9a0598ba4890337211d2333bbdf61ae25e2
Component: engine
2015-04-07 16:05:49 -07:00
2f18e59567
Test case for network mode chain container -> container -> host
...
Issue #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ce69dafe4d0424ddb5df53d9aee7728f0734cce7
Component: engine
2015-04-07 15:20:42 -07:00
4f7e8c1d9e
Removes unused function.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 195bebd3a7b6ffab1cfbb15ad9835ad83bca9737
Component: engine
2015-04-07 18:15:28 -04:00
c29bb140cc
Merge pull request #12120 from LK4D4/split_attach
...
Remove engine usage from attach
Upstream-commit: dccda72a41638c16b63c166d65a1ed663f01b60c
Component: engine
2015-04-07 18:13:35 -04:00
9f318dd3e8
Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44
...
Fix #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2f853b94931057d8ebcd6e21f7656d3a04e2acf4
Component: engine
2015-04-07 15:10:44 -07:00
f1afc0b3d1
Merge pull request #12154 from moxiegirl/carry-pr-11409
...
Carrying 11409 for a contributor
Upstream-commit: 8b7193057038d880be04d64e3470cdde30eb9218
Component: engine
2015-04-07 15:00:26 -07:00
b1b0f97441
Merge pull request #12155 from kostickm/12146-fix-fail-msg-TestRunDeviceDirectory
...
Fixing fail message in TestRunDeviceDirectory
Upstream-commit: d1423d28b59dcf1bb3e634033cdccb39afe366af
Component: engine
2015-04-07 14:55:30 -07:00
c4ee31b99c
Merge pull request #12156 from moxiegirl/pr-12008-carry
...
Carry PR 12008 for contributor
Upstream-commit: 65ca20e6f1ee74c3b6b786873d5b7b213d21a0d1
Component: engine
2015-04-07 14:54:02 -07:00
49e191d0e4
Remove engine usage from attach
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c44f513248a8b40b1b2221726c7441881383e919
Component: engine
2015-04-07 14:23:09 -07:00
7753b7bbca
Fix fail message in TestEventsImageImport
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8fd2b52146b443dd464df5199d79c69047c81eea
Component: engine
2015-04-07 14:22:43 -07:00
Antonio Murdaca
Brian Goff
Alexander Morozov
Arnaud Porterie
Yan Feng
Doug Davis
Phil Estes
Hu Keping
Ahmet Alp Balkan
WiseTrem
Doug Davis
Jessica Frazelle
Michael Crosby
Chris Stivers
Mary Anthony
Megan Kostick
Felix Schindler
Deshi Xiao
Yuan Sun
Jessie Frazelle
Alexander Morozov
Mrunal Patel
Tibor Vass