microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
14 491 коммит 243 Ветки 83 Теги 222 MiB
Граф коммитов

14491 Коммитов

Автор SHA1 Сообщение Дата
Mary Anthony fdfc36db41 Carrying 11409 for a client 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 13:20:17 -07:00
Vincent Batts 86d66d6273 Merge pull request #12033 from rhvgoyal/devmapper-cleanup 
Devmapper Graph Driver Misc cleanup
 2015-04-07 15:49:32 -04:00
Phil Estes e011119a49 Merge pull request #12129 from duglin/RemoveTable5 
Remove engine.Table from more daemon side stuff
 2015-04-07 12:53:55 -04:00
moxiegirl 531d2b3b80 Merge pull request #12136 from YanFeng-Adam/typo 
Fix 2 typos in /doc/sources/reference/run.md
 2015-04-07 09:21:01 -07:00
Yan Feng 805f34bb5b Fix 2 typos in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-07 14:15:05 -04:00
Jessie Frazelle 9ede3f9fc1 Merge pull request #12127 from ahmetalpbalkan/win-cli/termsize-fix 
Swap width/height in GetWinsize and monitorTtySize
 2015-04-06 16:54:29 -07:00
Doug Davis 650bc2ffe5 Remove engine.Table from more daemon side stuff 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-06 15:06:02 -07:00
Ahmet Alp Balkan 6e44246fed Swap width/height in GetWinsize and monitorTtySize 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-06 14:31:42 -07:00
Phil Estes 3588c5fbc7 Merge pull request #12125 from LK4D4/fix_events_streaming_test 
Fix events streaming test
 2015-04-06 17:12:48 -04:00
Alexandr Morozov e45bf8d2e9 Decrease timeouts in TestEventsStreaming 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2015-04-06 13:40:56 -07:00
Alexandr Morozov 5fa3a6f248 Pass right timestamp instead of crap from string(int64) 
Problem is that --since can consume anything not near looking as
timestamp.

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2015-04-06 13:39:02 -07:00
Phil Estes dec48d6708 Merge pull request #12070 from duglin/RemoveTableCLI 
Last step in removing engine.Table from api/client/*
 2015-04-06 16:33:29 -04:00
Arnaud Porterie 8a50746b5d Merge pull request #11686 from willhf/9340_test 
Add test for net=container and links
 2015-04-06 13:21:01 -07:00
Michael Crosby 488a721dc9 Merge pull request #12121 from tiborvass/copy-not-deprecated 
Revert "Since `COPY` has been deprecated in the recent release of Docker...
 2015-04-06 13:18:55 -07:00
Tibor Vass d2992c78dc Revert "Since `COPY` has been deprecated in the recent release of Docker I updated the best practices section to inform users that `ADD` is the way forward and to not use `COPY`." 
COPY was not deprecated.

This reverts commit 3148063af1.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-06 15:34:10 -04:00
Jessie Frazelle 37a16580b1 Merge pull request #12064 from brendandixon/win-cli/rawfix 
Windows console fixes
 2015-04-06 18:45:08 +00:00
moxiegirl 9cad920c08 Merge pull request #11993 from crunchywelch/master 
add centos to supported distros
 2015-04-06 11:44:40 -07:00
moxiegirl 2c44556ff9 Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update 
Updated the dockerfile best practice section on ADD and COPY
 2015-04-06 11:43:50 -07:00
moxiegirl ce18734c2c Merge pull request #12055 from l0kix2/patch-1 
Improved "start a container" section 1.16 & 1.17 API docs
 2015-04-06 11:41:38 -07:00
Alexander Morozov f5657249a0 Merge pull request #11324 from sunyuan3/TestDaemonwithwrongkey 
add TestDaemonwithwrongkey test case
 2015-04-06 11:35:05 -07:00
Alexander Morozov a0fc0343b7 Merge pull request #12090 from runcom/12079-events-streaming-tests 
Test events streaming
 2015-04-06 11:23:47 -07:00
Arnaud Porterie ed8d402851 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
 2015-04-06 11:11:31 -07:00
Doug Davis 065648a832 Last step in removing engine.Tabel from api/client/* 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-06 10:55:53 -07:00
Tibor Vass 281b8f67e1 Merge pull request #11293 from shishir-a412ed/docker_load_clobber_image_name 
Fix for Issue 11285: warning message displayed when updating an existing image
 2015-04-06 13:04:49 -04:00
malnick 3148063af1 Since `COPY` has been deprecated in the recent release of Docker I updated the best practices section to inform users that `ADD` is the way forward and to not use `COPY`. 
Signed-off-by: malnick <malnick@gmail.com>
 2015-04-06 10:04:42 -07:00
moxiegirl 3e077bb3f7 Merge pull request #12100 from draghuram/docker_update 
Add the missing option to the wget command for updating Docker.
 2015-04-06 10:03:23 -07:00
Antonio Murdaca d1c4439b5a Test events streaming, fixes #12079 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-06 19:00:17 +02:00
moxiegirl 96c3141fa5 Merge pull request #12020 from chenhanxiao/docker-import-commit 
docs: keep the style of docker-commit consistent with docker-import
 2015-04-06 09:47:47 -07:00
Brian Goff d3fa57e051 Merge pull request #12112 from kostickm/12042-fix-logDone-format 
Fixes logDone format
 2015-04-06 12:34:38 -04:00
Tianon Gravi 8b4c3a111d Merge pull request #10275 from Snorch/master 
docker-tests: mount hierarchies and make symlinks for subsystems
 2015-04-06 10:32:04 -06:00
moxiegirl d489b91aa9 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754 
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
 2015-04-06 09:23:53 -07:00
Arnaud Porterie ac93a13e27 Merge pull request #11554 from Sirupsen/logrus-fields 
logging: use logrus fields
 2015-04-06 09:00:18 -07:00
Megan Kostick d6ada45f45 Closes #12042 - fix logDone format 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-06 08:54:35 -07:00
Arnaud Porterie 90be2a66a8 Merge pull request #12102 from x1022as/typo 
fix typo
 2015-04-06 08:46:41 -07:00
Arnaud Porterie b9d2ede4d4 Merge pull request #12107 from cpuguy83/remove_striptrailingchars 
Remove `stripTrailingCharacters` from tests
 2015-04-06 08:46:08 -07:00
Arnaud Porterie 716576b0cc Merge pull request #12110 from leoh0/fix-typo 
Minor spelling fix
 2015-04-06 08:43:18 -07:00
Eohyung Lee 7986c37996 Minor spelling fix 
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com>
 2015-04-06 23:27:53 +09:00
Brian Goff 475c65319b Remove `stripTrailingCharacters` from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-06 09:21:18 -04:00
Shishir Mahajan 7d0053d554 Applying: Fix for Issue 11285: warning message displayed when updating an existing image 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-04-06 09:05:03 -04:00
Deng Guangxing 71de711189 fix typo in cli.md 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-06 16:11:40 +08:00
Raghuram Devarakonda 9287e70c12 Add the missing option to the wget command for updating Docker. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
 2015-04-05 23:00:21 -04:00
willhf bc0cdc0a4c Fix incompatible flags conditional 
Signed-off-by: willhf <willhf@gmail.com>
 2015-04-05 19:38:31 -07:00
Simei He 5057d7da13 fix the space thing. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-06 09:00:59 +08:00
Yuan Sun ef13dcd4dc add TestDaemonwithwrongkey test case 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-06 08:57:47 +08:00
Doug Davis 58390b6087 Merge pull request #12075 from eljojo/remove_stupid 
Remove "stupid" wording
 2015-04-04 12:37:38 -04:00
José Tomás Albornoz 4cf5a1c2aa Remove "stupid" wording 
Signed-off-by: José Tomás Albornoz <jojo@eljojo.net>
 2015-04-04 15:26:45 +02:00
Doug Davis ca8d196d13 Merge pull request #12074 from guoxiuyan/Fix_typo 
Fix a minor typo
 2015-04-04 07:34:35 -04:00
Kirill SIbirev ac12c80537 Improved "start a container" section in 1.16 & 1.17 docs 
It seems it was lost or something

Signed-off-by: Kirill Sibirev <l0kix2@gmail.com>
 2015-04-04 11:23:49 +03:00
guoxiuyan ffcc4a1e52 Fix a minor typo 
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
 2015-04-04 15:36:35 +08:00
Michael Crosby 2a79d54f4c Merge pull request #12063 from icecrime/update_maintainers 
Several updates to MAINTAINERS file
 2015-04-03 17:20:20 -07:00