clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-26 16:10:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,548 Commits 9 Branches 112 Tags
7dff1c15d2b43fa05e296c7df302b2c11fc014c2
Commit Graph
14548 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff 7dff1c15d2 Merge pull request #12223 from YanFeng-Adam/typo 
Fix a typo in docker/daemon/execdriver/native/exec.go
 2015-04-09 11:49:02 -04:00
Yan Feng ab11d60555 Fix a typo in docker/daemon/execdriver/native/exec.go 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-09 11:46:09 -04:00
Doug Davis 8295bed3df Merge pull request #12207 from WiseTrem/getBoolParam 
Removing unused getBoolParam func from api/server/server.go
 2015-04-09 08:28:48 -07:00
Phil Estes 00fd226430 Merge pull request #12227 from HuKeping/rm-rename 
Remove Job from rename
 2015-04-09 11:27:14 -04:00
Hu Keping 49c4de4aeb Remove Job from rename 
A part of ISSUE#12151-Remove engine.Job mechanism

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-04-10 01:52:55 +08:00
Phil Estes 3ca46f29b8 Merge pull request #12232 from ahmetalpbalkan/names/kilby-joyce 
namesgenerator: Proposing Kilby/Noyce
 2015-04-09 11:25:19 -04:00
Ahmet Alp Balkan 197ec4a637 namesgenerator: Proposing Kilby/Noyce 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-09 04:11:06 -07:00
WiseTrem 0fc75a3136 Removing unused getBoolParam func from api/server/server.go 
Fix #12199

Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
 2015-04-09 09:13:16 +03:00
Brian Goff 91abff41dd Merge pull request #12206 from jfrazelle/11966-fix-racy-tests-on-overlay 
cleanup/fix integration-cli for overlay in overlay
 2015-04-08 20:52:58 -04:00
Jessica Frazelle 255b84444a cleanup/fix integration-cli for overlay in overlay 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-04-08 16:59:36 -07:00
Arnaud Porterie 7233bd223d Merge pull request #12163 from duglin/RemoveJobPS 
Remove Job from PS API
 2015-04-08 13:43:47 -07:00
Michael Crosby 56a2c58760 Merge pull request #12194 from icecrime/update_maintainers 
Drop shin from MAINTAINERS
 2015-04-08 13:43:01 -07:00
Michael Crosby 66a68e378c Merge pull request #12171 from cstivers78/patch-1 
Proposing Seymour Cray
 2015-04-08 13:42:13 -07:00
Arnaud Porterie d0c1fba73e Drop shin from MAINTAINERS 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-08 13:31:42 -07:00
Chris Stivers 5206f76f44 Proposing Seymour Cray 
Signed-off-by: Chris Stivers <chris@stivers.us>
 2015-04-08 13:17:22 -07:00
Alexander Morozov 776b7e8559 Merge pull request #12191 from kostickm/12189-fix-json-tags 
Fixing JSON Tags
 2015-04-08 13:11:54 -07:00
moxiegirl 57536d82e7 Merge pull request #12187 from moxiegirl/docs-makefile-update 
Adding environment variables for sub projects
 2015-04-08 12:48:09 -07:00
Mary Anthony ef8b917fac Adding environment variables for sub projects 
Fixes issue #12186
Fixing variables per Jess

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-08 12:23:50 -07:00
Megan Kostick 88119bb276 Fixing JSON Tags 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-08 12:05:12 -07:00
moxiegirl 26e83832c7 Merge pull request #11855 from nfirvine/master 
Add some new graphics for mac installation with boot2docker
 2015-04-08 10:41:50 -07:00
Doug Davis 1bfa80bdd9 Remove Job from PS API 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-08 10:30:17 -07:00
moxiegirl ebc1e5ec9f Merge pull request #12176 from YanFeng-Adam/typo 
Fix a typo in /doc/sources/reference/run.md
 2015-04-08 10:08:05 -07:00
Arnaud Porterie b8a7fdade6 Merge pull request #12178 from fschindler/fix-typo 
Fixing typo.
 2015-04-08 09:10:53 -07:00
moxiegirl 254d6f7752 Merge pull request #12133 from xiaods/fixed-issue-11500 
fixed #11500 Add tip about filter proxy
 2015-04-08 09:09:54 -07:00
Arnaud Porterie a6d39e2a2d Merge pull request #12168 from cpuguy83/remove_dup_file_creation 
Remove duplicate config file creation.
 2015-04-08 09:03:43 -07:00
Alexander Morozov 3ebfc99d10 Merge pull request #12066 from LK4D4/split_events 
Remove engine usage from events
 2015-04-08 08:29:24 -07:00
Yan Feng 64fd944e30 Fix a typo in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-08 11:23:47 -04:00
Arnaud Porterie 94ade35e46 Merge pull request #12183 from runcom/remove-job-diff 
Remove engine.Job from diff
 2015-04-08 08:21:43 -07:00
Antonio Murdaca e379e2668c Remove engine.Job from diff 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-08 15:52:10 +02:00
Doug Davis 7cfe438151 Merge pull request #12132 from sunyuan3/d 
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
 2015-04-08 08:09:22 -04:00
Felix Schindler 8afd5cad31 Fixing typo. 
Added missing white space.

Signed-off-by: Felix Schindler <fschindler@weluse.de>
 2015-04-08 11:03:11 +02:00
Deshi Xiao a40f379878 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>
 2015-04-08 14:13:01 +08:00
Yuan Sun cc30282e94 duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-08 13:33:05 +08:00
Brian Goff 24057777af 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>
 2015-04-07 21:36:30 -04:00
Michael Crosby 06433cf812 Merge pull request #12161 from LK4D4/update_libcontainer 
Update libcontainer
 2015-04-07 16:18:33 -07:00
Jessie Frazelle d08db9a059 Merge pull request #12160 from mrunalp/remove_unused 
Removes unused function.
 2015-04-07 16:05:49 -07:00
Alexander Morozov ce69dafe4d Test case for network mode chain container -> container -> host 
Issue #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 15:20:42 -07:00
Mrunal Patel 195bebd3a7 Removes unused function. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-04-07 18:15:28 -04:00
Tibor Vass dccda72a41 Merge pull request #12120 from LK4D4/split_attach 
Remove engine usage from attach
 2015-04-07 18:13:35 -04:00
Alexander Morozov 2f853b9493 Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44 
Fix #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 15:10:44 -07:00
moxiegirl 8b71930570 Merge pull request #12154 from moxiegirl/carry-pr-11409 
Carrying 11409 for a contributor
 2015-04-07 15:00:26 -07:00
Alexander Morozov d1423d28b5 Merge pull request #12155 from kostickm/12146-fix-fail-msg-TestRunDeviceDirectory 
Fixing fail message in TestRunDeviceDirectory
 2015-04-07 14:55:30 -07:00
moxiegirl 65ca20e6f1 Merge pull request #12156 from moxiegirl/pr-12008-carry 
Carry PR 12008 for contributor
 2015-04-07 14:54:02 -07:00
Alexander Morozov c44f513248 Remove engine usage from attach 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 14:23:09 -07:00
Alexander Morozov 8fd2b52146 Fix fail message in TestEventsImageImport 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 14:22:43 -07:00
Mary Anthony 87e70b6831 Carry PR 12008 for contributor 
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 14:09:53 -07:00
Tibor Vass 9dd23be563 Merge pull request #11947 from TonnyXu/master 
Updated the explanation of ONBUILD in best-practices doc
 2015-04-07 16:53:43 -04:00
moxiegirl 4d4f201a4d Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert 
Replaced level with layer for OSI model references
 2015-04-07 13:29:40 -07:00
Jessie Frazelle ebd7df3bbe Merge pull request #11909 from runcom/11908-refactor-utils-utils-daemon 
Refactor utils/utils_daemon
 2015-04-07 13:24:24 -07:00
Mary Anthony fdfc36db41 Carrying 11409 for a client 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 13:20:17 -07:00