summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update README.mdmoxiegirl-patch-READMEmoxiegirl2015-10-241-4/+2
| | | Update for fixes.
* Merge pull request #17296 from jecarey/16756-docker_cli_history_testBrian Goff2015-10-241-21/+10
|\ | | | | Use of checkers on docker_cli_history_test.go
| * Use of checkers on docker_cli_history_test.goJames Carey2015-10-231-21/+10
| | | | | | | | Signed-off-by: James Carey <jecarey@us.ibm.com>
* | Merge pull request #17301 from sdurrheimer/zsh-completion-splunk-log-driverBrian Goff2015-10-241-2/+2
|\ \ | |/ |/| Add splunk log driver to zsh completion
| * Add splunk log driver to zsh completionSteve Durrheimer2015-10-241-2/+2
|/ | | | Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
* Merge pull request #17311 from lsiqueira/patch-1Sebastiaan van Stijn2015-10-231-1/+1
|\ | | | | Update CONTRIBUTING.md
| * Update CONTRIBUTING.mdLeandro Siqueira2015-10-231-1/+1
| | | | | | | | | | Fix typo and update number of questions Signed-off-by: Leandro Siqueira <leandro.siqueira@gmail.com>
* | Merge pull request #16488 from splunk/splunk_log_driverSebastiaan van Stijn2015-10-2310-4/+346
|\ \ | | | | | | Add Splunk logging driver #16207
| * | Add Splunk logging driver #16207Denis Gladkikh2015-10-2310-4/+346
| | | | | | | | | | | | | | | | | | Allow to send Splunk logs using Http Event Collector Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
* | | Merge pull request #16433 from Microsoft/10662-volumes5Tibor Vass2015-10-2347-714/+1693
|\ \ \ | | | | | | | | Windows: [TP4] Add volume support
| * | | Windows: Add volume supportJohn Howard2015-10-2247-714/+1693
| | | | | | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | | Merge pull request #15780 from mountkin/build-multi-tagsSebastiaan van Stijn2015-10-2310-40/+119
|\ \ \ \ | |_|/ / |/| | | Add ability to add multiple tags with docker build
| * | | Add ability to add multiple tags with docker buildShijiang Wei2015-10-2410-40/+119
| | | | | | | | | | | | | | | | Signed-off-by: Shijiang Wei <mountkin@gmail.com>
* | | | Merge pull request #17306 from albers/completion-log-driver-optionsVincent Demeester2015-10-231-8/+15
|\ \ \ \ | | | | | | | | | | bash completion for log driver options `env` and `labels`
| * | | | bash completion for log driver options `env` and `labels`Harald Albers2015-10-231-8/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Harald Albers <github@albersweb.de>
* | | | | Merge pull request #17291 from aaronlehmann/buffer-compressionTibor Vass2015-10-231-1/+9
|\ \ \ \ \ | | | | | | | | | | | | Add a buffered Writer between layer compression and layer upload
| * | | | | Add a buffered Writer between layer compression and layer uploadAaron Lehmann2015-10-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this buffering, the compressor was outputting 64 bytes at a time to the HTTP stream, which was resulting in absurdly small chunk sizes and a lot of extra overhead. The buffering restores the chunk size to 32768 bytes, which matches the behavior with 1.8.2. Times pushing to a local registry: 1.8.2: 0m18.934s master: 0m20.564s master+this commit: 0m17.593s Fixes: #17038 Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
* | | | | | Merge pull request #17303 from coolljt0725/remove_unused_parameterAntonio Murdaca2015-10-231-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Remove unused parmeter of createRootFilesystemInDriver in graph/graph.go
| * | | | | Remove unused parmeter of createRootFilesystemInDriver in graph/graph.goLei Jitang2015-10-231-2/+2
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Lei Jitang <leijitang@huawei.com>
* | | | | Merge pull request #17287 from maaquib/16756-integration-cli-experimental-testBrian Goff2015-10-231-23/+16
|\ \ \ \ \ | | | | | | | | | | | | Using checkers assert for integration-cli/docker_cli_experimental_test.go
| * | | | | Using checkers assert for integration-cli/docker_cli_experimental_test.goMohammed Aaqib Ansari2015-10-221-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
* | | | | | Merge pull request #17299 from sdurrheimer/zsh-completion-network-inspect-multiVincent Demeester2015-10-231-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Zsh completion for 'docker network inspect' multiple networks
| * | | | | Zsh completion for 'docker network inspect' multiple networksSteve Durrheimer2015-10-231-1/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
* | | | | Merge pull request #17295 from SvenDowideit/two-more-linksSebastiaan van Stijn2015-10-222-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Two more links to fix
| * | | | Two more links to fixSven Dowideit2015-10-232-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
* | | | Merge pull request #17284 from calavera/buffer_inspect_templateMichael Crosby2015-10-222-31/+70
|\ \ \ \ | | | | | | | | | | Fail when there is an error executing an inspect template.
| * | | | Fail when there is an error executing an inspect template.David Calavera2015-10-222-31/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not execute the template directly in the cli outout, go is not atomic in this operation and can send bytes before failing the execution. - Fail after evaluating a raw interface if the typed execution also failed, assuming there is a template parsing error. Signed-off-by: David Calavera <david.calavera@gmail.com>
* | | | | Merge pull request #17278 from mavenugo/etchostsTibor Vass2015-10-2215-31/+183
|\ \ \ \ \ | |/ / / / |/| | | | Vendoring libnetwork & libkv with fixes
| * | | | Add integ-test for fixed--cidr == bridge networkAlessandro Boch2015-10-221-0/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Alessandro Boch <aboch@docker.com>
| * | | | Vendoring in libkv to be aligned with libnetworkMadhu Venugopal2015-10-225-1/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Madhu Venugopal <madhu@docker.com>
| * | | | Vendoring in LibnetworkMadhu Venugopal2015-10-2210-30/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This carries fixes for - Internal racy /etc/hosts updates within container during SD - Renable SD service record watch after cluster-store restarts - Fix to allow remote IPAM driver to return no IP if the user prefers - Fix to allow --fixed-cidr and --bip to be in same range Signed-off-by: Madhu Venugopal <madhu@docker.com>
* | | | | Merge pull request #17275 from vdemeester/17246-tags-to-repotagsTibor Vass2015-10-227-10/+46
|\ \ \ \ \ | |/ / / / |/| | | | Use RepoTags & RepoDigest in inspect
| * | | | Use RepoTags & RepoDigest in inspectVincent Demeester2015-10-227-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be coherent with /images/json (images command) Signed-off-by: Vincent Demeester <vincent@sbr.pm>
* | | | | Merge pull request #17270 from albers/completion-network-idsDavid Calavera2015-10-221-1/+13
|\ \ \ \ \ | | | | | | | | | | | | bash completion can be configured to complete network IDs
| * | | | | bash completion can be configured to complete network IDsHarald Albers2015-10-221-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Harald Albers <github@albersweb.de>
* | | | | | Merge pull request #17274 from aboch/aiDavid Calavera2015-10-225-3/+109
|\ \ \ \ \ \ | | | | | | | | | | | | | | Turn off discovery when icc == false
| * | | | | | Turn off service discovery when icc==falseAlessandro Boch2015-10-222-2/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Turn off built-in service discovery on docker0 bridge when icc is false Signed-off-by: Alessandro Boch <aboch@docker.com>
| * | | | | | Vendoring in libnetwork for the anonymous endpointAlessandro Boch2015-10-213-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - commit f3c8ebf46b890d4612c5d98e792280d13abdb761 Signed-off-by: Alessandro Boch <aboch@docker.com>
* | | | | | | Merge pull request #17269 from tonistiigi/trust-deprecation-warningAntonio Murdaca2015-10-221-7/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Show trust variable deprecation warning only if used
| * | | | | | | Show trust variable deprecation warning only if usedTonis Tiigi2015-10-221-7/+9
| | |/ / / / / | |/| | | | | | | | | | | | Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
* | | | | | | Merge pull request #17268 from albers/completion-network-inspect-argsVincent Demeester2015-10-221-5/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | bash completion for `docker network inspect` supports multiple networks
| * | | | | | bash completion for `docker network inspect` supports multiple networksHarald Albers2015-10-221-5/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Harald Albers <github@albersweb.de>
* | | | | | Merge pull request #17259 from SvenDowideit/fix-some-errant-linksSebastiaan van Stijn2015-10-225-10/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix some errant links
| * | | | | Fix some errant linksSven Dowideit2015-10-225-10/+9
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
* | | | | Merge pull request #16784 from MHBauer/test-refactorVincent Demeester2015-10-221-135/+76
|\ \ \ \ \ | | | | | | | | | | | | use gocheck asserts instead of fatal
| * | | | | use gocheck asserts instead of fatalMorgan Bauer2015-10-191-135/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - for #16756 Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
* | | | | | Merge pull request #17241 from gondor/docs-extend-pluginsSebastiaan van Stijn2015-10-211-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | docs: Add Netshare volume plugin to extend/plugins
| * | | | | | changes from review - which -> thatJeremy Unruh2015-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
| * | | | | | changes from review - move up to conform to alphabetical orderJeremy Unruh2015-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
| * | | | | | docs: Add Netshare volume plugin to extend/pluginsJeremy Unruh2015-10-211-0/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com>
View Lorry Controller Status