p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,544 Commits 2 Branches 295 Tags
151e2df62bb1351603c6b5ffcfdf65baf3cabca0
Commit Graph

14544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
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
Hu Keping
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
Phil Estes
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
Ahmet Alp Balkan
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
Brian Goff
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
Jessica Frazelle
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
Arnaud Porterie
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
Michael Crosby
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
Michael Crosby
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
Arnaud Porterie
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
Chris Stivers
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
Alexander Morozov
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
moxiegirl
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
Mary Anthony
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
Megan Kostick
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
moxiegirl
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
Doug Davis
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
moxiegirl
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
Arnaud Porterie
1ba10c92c9 Merge pull request #12178 from fschindler/fix-typo 
Fixing typo.
Upstream-commit: b8a7fdade6351fc2201f8e7ca9b9416782852c4d
Component: engine
 2015-04-08 09:10:53 -07:00
moxiegirl
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
Arnaud Porterie
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
Alexander Morozov
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
Yan Feng
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
Arnaud Porterie
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
Antonio Murdaca
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
Doug Davis
24cbf276f9 Merge pull request #12132 from sunyuan3/d 
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
Upstream-commit: 7cfe438151d29f9e8976d2ed7a2b0da834129eff
Component: engine
 2015-04-08 08:09:22 -04:00
Felix Schindler
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
Deshi Xiao
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
Yuan Sun
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
Brian Goff
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
Michael Crosby
42584d8cbb Merge pull request #12161 from LK4D4/update_libcontainer 
Update libcontainer
Upstream-commit: 06433cf812e26e468b9dcb6b0817f6597f1c397c
Component: engine
 2015-04-07 16:18:33 -07:00
Jessie Frazelle
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
Alexander Morozov
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
Mrunal Patel
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
Tibor Vass
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
Alexander Morozov
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
moxiegirl
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
Alexander Morozov
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
moxiegirl
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
Alexander Morozov
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
Alexander Morozov
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
Mary Anthony
27dad5da53 Carry PR 12008 for contributor 
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 87e70b6831386775a0d6c6b952c947865f1d053b
Component: engine
 2015-04-07 14:09:53 -07:00
Tibor Vass
8dfe9e8a9b Merge pull request #11947 from TonnyXu/master 
Updated the explanation of ONBUILD in best-practices doc
Upstream-commit: 9dd23be563be63b8dc3cf0ffda696cdf558f82fd
Component: engine
 2015-04-07 16:53:43 -04:00
moxiegirl
c9ca56fbcb Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert 
Replaced level with layer for OSI model references
Upstream-commit: 4d4f201a4d453501dbe1fc049abad98c4933b237
Component: engine
 2015-04-07 13:29:40 -07:00
Jessie Frazelle
ca7b99332a Merge pull request #11909 from runcom/11908-refactor-utils-utils-daemon 
Refactor utils/utils_daemon
Upstream-commit: ebd7df3bbeb9486d13119178810a1ddabfd6d04d
Component: engine
 2015-04-07 13:24:24 -07:00
Mary Anthony
5ce261de6c Carrying 11409 for a client 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fdfc36db416663e3c8434c031e01bd6211ce5d8b
Component: engine
 2015-04-07 13:20:17 -07:00
Megan Kostick
15349ce580 Fixing fail message in TestRunDeviceDirectory 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: 05dcf261992ee2fe639977a9e063051cadaf1c50
Component: engine
 2015-04-07 13:14:47 -07:00
Vincent Batts
37758aba7d Merge pull request #12033 from rhvgoyal/devmapper-cleanup 
Devmapper Graph Driver Misc cleanup
Upstream-commit: 86d66d62737aa090b4a703ce0bfe3df0f9669a6b
Component: engine
 2015-04-07 15:49:32 -04:00
Phil Estes
b525e35a97 Merge pull request #12129 from duglin/RemoveTable5 
Remove engine.Table from more daemon side stuff
Upstream-commit: e011119a497b6c6c18a6d1f048b1e69e2ab2eb7a
Component: engine
 2015-04-07 12:53:55 -04:00
moxiegirl
3b55a8d20b Merge pull request #12136 from YanFeng-Adam/typo 
Fix 2 typos in /doc/sources/reference/run.md
Upstream-commit: 531d2b3b80ee92c7cda93e388ca0a747935c87eb
Component: engine
 2015-04-07 09:21:01 -07:00