toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,457 Commits 3 Branches 295 Tags
d89c51c3b50b51ea63384ed0cbebbd57f2214fd0
Commit Graph
14457 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Batts d89c51c3b5 devmapper: storage-opt override for udev sync 
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.

Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.

Including link to the docs for users that encounter this daemon error
during an upgrade.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0e21782de5c038dfa3cfdfc7655b9e6b143baa7b
Component: engine
 2015-04-10 15:43:16 -04:00
Vincent Batts 25835c875f devmapper: udev sync is a requirement 
closes #10664
closes #4036

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: ca628c6216ade64790dfbfe388fe4769433ec4aa
Component: engine
 2015-04-06 15:17:57 -04:00
Arnaud Porterie 142a5765d0 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
 2015-04-06 11:11:31 -07:00
Tibor Vass 4642e7f120 Merge pull request #11293 from shishir-a412ed/docker_load_clobber_image_name 
Fix for Issue 11285: warning message displayed when updating an existing image
Upstream-commit: 281b8f67e145f58a3b364ce469ae71e216961e8c
Component: engine
 2015-04-06 13:04:49 -04:00
moxiegirl a65903a8b7 Merge pull request #12100 from draghuram/docker_update 
Add the missing option to the wget command for updating Docker.
Upstream-commit: 3e077bb3f73c4effa3135851811b23f1292ebe24
Component: engine
 2015-04-06 10:03:23 -07:00
moxiegirl 42264ee36e Merge pull request #12020 from chenhanxiao/docker-import-commit 
docs: keep the style of docker-commit consistent with docker-import
Upstream-commit: 96c3141fa5c81e3d672215d5bfcfb7534e96af2f
Component: engine
 2015-04-06 09:47:47 -07:00
Brian Goff 45fb864556 Merge pull request #12112 from kostickm/12042-fix-logDone-format 
Fixes logDone format
Upstream-commit: d3fa57e051cced38cdd65034077fe5b080999da7
Component: engine
 2015-04-06 12:34:38 -04:00
Tianon Gravi 42e6264f16 Merge pull request #10275 from Snorch/master 
docker-tests: mount hierarchies and make symlinks for subsystems
Upstream-commit: 8b4c3a111d025bdb7c4f78eaa233a7c74295ad67
Component: engine
 2015-04-06 10:32:04 -06:00
moxiegirl 07de27cc12 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754 
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS 
Upstream-commit: d489b91aa94a6e15d7d1daa953468cac9866f218
Component: engine
 2015-04-06 09:23:53 -07:00
Arnaud Porterie cedce1294d Merge pull request #11554 from Sirupsen/logrus-fields 
logging: use logrus fields
Upstream-commit: ac93a13e2745559887b5c5efd3cff1ed904f5092
Component: engine
 2015-04-06 09:00:18 -07:00
Megan Kostick f18fe75c72 Closes #12042 - fix logDone format 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
Upstream-commit: d6ada45f45c6743ec0ab3f049a0742278634a22a
Component: engine
 2015-04-06 08:54:35 -07:00
Arnaud Porterie 65d39050f9 Merge pull request #12102 from x1022as/typo 
fix typo
Upstream-commit: 90be2a66a8d5a179c976da5525a314fe5cd6cb59
Component: engine
 2015-04-06 08:46:41 -07:00
Arnaud Porterie a714c4cf33 Merge pull request #12107 from cpuguy83/remove_striptrailingchars 
Remove `stripTrailingCharacters` from tests
Upstream-commit: b9d2ede4d4dc67b97abd0254a9e431aa9c89b932
Component: engine
 2015-04-06 08:46:08 -07:00
Arnaud Porterie 35ff4787b1 Merge pull request #12110 from leoh0/fix-typo 
Minor spelling fix
Upstream-commit: 716576b0ccb9c35e88572cfe7f413648d2337976
Component: engine
 2015-04-06 08:43:18 -07:00
Eohyung Lee 9d932cfc62 Minor spelling fix 
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com>
Upstream-commit: 7986c37996aa7321eaf3e86dd844a3e5c36c8c68
Component: engine
 2015-04-06 23:27:53 +09:00
Brian Goff ab9a366f0e Remove stripTrailingCharacters from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 475c65319b4663d630711519e18d0b134c42c7f1
Component: engine
 2015-04-06 09:21:18 -04:00
Shishir Mahajan 9d18deed31 Applying: Fix for Issue 11285: warning message displayed when updating an existing image 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 7d0053d554c453f0ec426bde2899dd55a265f09a
Component: engine
 2015-04-06 09:05:03 -04:00
Deng Guangxing 403c32d670 fix typo in cli.md 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 71de711189659847ea18313b7b0a57703960d0da
Component: engine
 2015-04-06 16:11:40 +08:00
Raghuram Devarakonda c201586780 Add the missing option to the wget command for updating Docker. 
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: 9287e70c127b00bddb5a8d49f5ca97c19ac0614b
Component: engine
 2015-04-05 23:00:21 -04:00
Simei He 42748e46e4 fix the space thing. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 5057d7da132c287d52749b6c73a9cd6129a1c05a
Component: engine
 2015-04-06 09:00:59 +08:00
Doug Davis acaffd0b03 Merge pull request #12075 from eljojo/remove_stupid 
Remove "stupid" wording
Upstream-commit: 58390b60876412a70a72ee18cd85874213d73257
Component: engine
 2015-04-04 12:37:38 -04:00
José Tomás Albornoz 00cc5b6eeb Remove "stupid" wording 
Signed-off-by: José Tomás Albornoz <jojo@eljojo.net>
Upstream-commit: 4cf5a1c2aa2f95a0bca5a0bf47026518b7b2167f
Component: engine
 2015-04-04 15:26:45 +02:00
Doug Davis 30fc7fae8b Merge pull request #12074 from guoxiuyan/Fix_typo 
Fix a minor typo
Upstream-commit: ca8d196d1385595fca2156969537155c5a63f788
Component: engine
 2015-04-04 07:34:35 -04:00
guoxiuyan 7919b8b131 Fix a minor typo 
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
Upstream-commit: ffcc4a1e52def3b1552ae3c7ba4ee1fb47f92cea
Component: engine
 2015-04-04 15:36:35 +08:00
Michael Crosby ac2db88b40 Merge pull request #12063 from icecrime/update_maintainers 
Several updates to MAINTAINERS file
Upstream-commit: 2a79d54f4c62165ee348adf98297950e886f1d4b
Component: engine
 2015-04-03 17:20:20 -07:00
Arnaud Porterie fbb577a9e7 Merge pull request #12069 from whoshuu/notice-link 
Make NOTICE in the README into a link
Upstream-commit: a45375f1f95d14dac9c065e3aa79d0949e68fe14
Component: engine
 2015-04-03 17:08:53 -07:00
Arnaud Porterie 3099776db6 Add thaJeztah 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 886026f99e4b13b0fa2ee4c5582786a863e1d0d1
Component: engine
 2015-04-03 16:37:36 -07:00
Huu Nguyen c96dd46bbb Make NOTICE in the README into a link 
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
Upstream-commit: d94e186442ef4ba3103a6ad72666782179d3c2b8
Component: engine
 2015-04-03 16:36:49 -07:00
Tianon Gravi 38bbd48daa Merge pull request #12065 from proppy/patch-14 
test-unit: fix TESTFLAGS doc
Upstream-commit: 6a99c2032eeed5b3a308f6fc30e9242ef36d6db0
Component: engine
 2015-04-03 16:26:11 -06:00
Simon Eskildsen 5743caf126 daemon: convert version log statement to fields 
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
Upstream-commit: e1ca439828c33a186489da568a29d3f3a2951e03
Component: engine
 2015-04-03 18:22:17 -04:00
Johan Euphrosine 6db76a476b test-unit: fix TESTFLAGS doc 
Signed-off-by: Johan Euphrosine <proppy@google.com>
Upstream-commit: 5846914f91f16c9d940701c9bbc0ebb8ab3c4226
Component: engine
 2015-04-03 15:05:14 -07:00
Arnaud Porterie 64ee249cb8 Rename status labels 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 58f07c9d8aa9b54f74af141d74314b607e2c18c5
Component: engine
 2015-04-03 14:33:16 -07:00
Arnaud Porterie b00d56f4e3 Sort maintainers alphabetically 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 80f3085651717f2f487ae41633490db59716cc04
Component: engine
 2015-04-03 14:33:16 -07:00
Arnaud Porterie fcb663dbcb Move docs approval section 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 370cef012e81f11a87fcf7f1384dbbca6cab0c6c
Component: engine
 2015-04-03 14:33:16 -07:00
Jessie Frazelle 8973909f13 Merge pull request #12060 from duglin/RemoveTable3 
Remove engine.Table from docker search and fix missing field
Upstream-commit: b2fbd9e632191e6d6494b7dfd4dc0798e1fa47c7
Component: engine
 2015-04-03 21:29:36 +00:00
Jessie Frazelle d1ddfb9a9a Merge pull request #11886 from jamiehannaford/pkg-mnt-docs 
Document exported functions and consts in pkg/mount
Upstream-commit: 9cdad8a26b4af14680c4bcb25feea854536a323b
Component: engine
 2015-04-03 21:28:11 +00:00
Alexander Morozov 1b8721e96e Merge pull request #11994 from unclejack/jsonfilelog_allocations 
daemon/logger/jsonfilelog: avoid some allocations
Upstream-commit: 5c83dfe670373135a4f38e926a6f1d19ed23cf69
Component: engine
 2015-04-03 13:58:13 -07:00
Jessie Frazelle dd79c80fbf Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update 
docs: Add new windows installation tutorials
Upstream-commit: 4d571257edf628a42e54885befc63a7374aab3be
Component: engine
 2015-04-03 20:39:21 +00:00
moxiegirl 02c373c0f8 Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter 
docs: fix bullet list and missing label filter
Upstream-commit: fb1e10284bb04b29c21357675374fdd27a8ff3e4
Component: engine
 2015-04-03 12:33:22 -07:00
moxiegirl d54d64d3e2 Merge pull request #12003 from sleinen/patch-1 
Make explanation consistent with command
Upstream-commit: a6c04f33e141527b24dc373a68ed62e2201803a0
Component: engine
 2015-04-03 12:19:37 -07:00
moxiegirl f8af71c0cf Merge pull request #12057 from icecrime/11925_carry 
Specify running `boot2docker ip` on host
Upstream-commit: 6d5a0ac11ea50cd46d6f04435e49bb1b08bd0d60
Component: engine
 2015-04-03 12:11:53 -07:00
Jessie Frazelle e471adcfbf Merge pull request #12048 from tianon/auto-btrfs_noversion 
Change the btrfs_noversion check to be automatic
Upstream-commit: 409ed98c3f95f90311127773baa78904ac8350b6
Component: engine
 2015-04-03 19:00:57 +00:00
Jessie Frazelle bf961698dc Merge pull request #12054 from eluck/master 
Update userguide/dockervolumes - fixes issue #12052
Upstream-commit: 3985dc299a5958481a9c0dcbd3bc7da69de6a19b
Component: engine
 2015-04-03 18:58:52 +00:00
Jessie Frazelle bd5aac3934 Merge pull request #12037 from twhiteman/master 
integration-cli: in TestPsListContainersSize, check for no containers
Upstream-commit: 3683498d6fe233f9f68fb5a6186158293b450049
Component: engine
 2015-04-03 18:52:26 +00:00
Jessie Frazelle ef9deeddf0 Merge pull request #12059 from whoshuu/readme 
Clean up formatting in the README
Upstream-commit: 55da2e59870b62eb2ee1830f0f67e0711494bb03
Component: engine
 2015-04-03 18:49:26 +00:00
Ahmet Alp Balkan 4514e9e241 docs: Add new windows installation tutorials 
Updated Windows installation documentation with newest
screencasts and Chocolatey instructions to install windows
client CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2b320a230979c3222162567b9d1d3193b0806cd5
Component: engine
 2015-04-03 11:33:34 -07:00
Doug Davis 938f87c2dd Remove engine.Table from docker search and fix missing field 
registry/SearchResults was missing the "is_automated" field.
I added it back in.

Pull this 'table' removal one from the others because it fixed
a bug too

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 67b4cce0f6c835cf9e53313a026af2e825ba8b10
Component: engine
 2015-04-03 11:27:30 -07:00
Michael Crosby dd7175bcb6 Merge pull request #12010 from ibuildthecloud/small 
Small changes from #11967 for review comments
Upstream-commit: e64f6baf116771b22a3050cf686624dbb6b19f37
Component: engine
 2015-04-03 11:27:06 -07:00
Jessie Frazelle 513240409b Merge pull request #11981 from unclejack/fix_profiler 
api/server: fix profiler HTTP serving
Upstream-commit: b3e9c274ddadde302d927a866c8704be77c871e0
Component: engine
 2015-04-03 18:25:12 +00:00
Michael Crosby c121c9b8d9 Merge pull request #12058 from duglin/RemoveTable2 
Remove engine.Table from docker history and docker rmi
Upstream-commit: 326a5545d43b63c1f806c3106be884c06facd77b
Component: engine
 2015-04-03 10:57:52 -07:00