summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Make 'TestRandomUnixTmpDirPath' platform agnostic"revert-16556-10662-randomunixArnaud Porterie2015-09-245-23/+14
|
* Merge pull request #16556 from Microsoft/10662-randomunixArnaud Porterie2015-09-245-14/+23
|\ | | | | Make 'TestRandomUnixTmpDirPath' platform agnostic
| * TestRandomUnixTmpDirPath platform agnosticJohn Howard2015-09-245-14/+23
| | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | Merge pull request #16541 from sunyuan3/newlogformatDavid Calavera2015-09-241-7/+31
|\ \ | | | | | | Update documentation for new test log format
| * | Update documentation for new test log format.Yuan Sun2015-09-241-7/+31
| | | | | | | | | | | | Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
* | | Merge pull request #16545 from HuKeping/fixtestDoug Davis2015-09-241-1/+1
|\ \ \ | |_|/ |/| | Fix test for container events
| * | Fix test for container eventsHu Keping2015-09-241-1/+1
| |/ | | | | | | Signed-off-by: Hu Keping <hukeping@huawei.com>
* | Merge pull request #16190 from LK4D4/drain_refactorJess Frazelle2015-09-244-112/+253
|\ \ | | | | | | Refactoring of bufReader
| * | Make bytesPipe use linear allocationsTonis Tiigi2015-09-233-57/+120
| | | | | | | | | Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
| * | Refactor bufReader to use BytesPipeAlexander Morozov2015-09-232-108/+23
| | | | | | | | | | | | Signed-off-by: Alexander Morozov <lk4d4@docker.com>
| * | Add BytesPipe datastructure to ioutilsAlexander Morozov2015-09-232-0/+163
| | | | | | | | | | | | Signed-off-by: Alexander Morozov <lk4d4@docker.com>
* | | Merge pull request #15021 from chenchun/resize_poolBrian Goff2015-09-238-17/+69
|\ \ \ | |_|/ |/| | Try to resize data and metadata loopback file when initiating devicemapper
| * | Try to resize data and metadata loopback file when initiating devicemapperChun Chen2015-09-248-17/+69
| | | | | | | | | | | | Signed-off-by: Chun Chen <ramichen@tencent.com>
* | | Merge pull request #16411 from duglin/DaemonErrorsBrian Goff2015-09-2312-47/+395
|\ \ \ | | | | | | | | Move more 'daemon' errors to the new error package
| * | | Move more 'daemon' errors to the new error packageDoug Davis2015-09-2312-47/+395
| | | | | | | | | | | | | | | | Signed-off-by: Doug Davis <dug@us.ibm.com>
* | | | Merge pull request #16415 from HuKeping/dockerinfoBrian Goff2015-09-234-42/+57
|\ \ \ \ | | | | | | | | | | Format output of docker info
| * | | | Format output of docker infoHu Keping2015-09-234-42/+57
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Format those info which will only be displayed when daemon is in debug mode. Signed-off-by: Hu Keping <hukeping@huawei.com>
* | | | Merge pull request #16540 from MHBauer/man-build-argDavid Calavera2015-09-231-1/+1
|\ \ \ \ | | | | | | | | | | fix typo in man page
| * | | | fix typo in man pageMorgan Bauer2015-09-231-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | - resolve #16536 Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
* | | | Merge pull request #16497 from MHBauer/attach-refactor-newJess Frazelle2015-09-232-10/+19
|\ \ \ \ | | | | | | | | | | refactor attach to not use internal data structures
| * | | | refactor attach to not use internal data structuresMorgan Bauer2015-09-232-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactor to make it easier to split the api in the future Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
* | | | | Merge pull request #16484 from HuKeping/history-formatJess Frazelle2015-09-231-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Format the output of docker history
| * | | | | Format the output of docker historyHu Keping2015-09-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once there have '\t' in the "CREATED BY" section, it will possibly cause a messy output of docker history. Signed-off-by: Hu Keping <hukeping@huawei.com>
* | | | | | Merge pull request #16494 from calavera/fix_plugin_url_schemeAlexandre Beslic2015-09-232-4/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not hardcode http as plugin URL scheme for secure connections.
| * | | | | | Do not hardcode http as plugin URL scheme for secure connections.David Calavera2015-09-222-4/+26
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: David Calavera <david.calavera@gmail.com>
* | | | | | Merge pull request #16504 from brahmaroutu/ImageErrorsTibor Vass2015-09-232-2/+22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Adding error codes to image package
| * | | | | Adding error codes to image packageSrini Brahmaroutu2015-09-232-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
* | | | | | Merge pull request #16517 from coolljt0725/show_help_all_the_timeTibor Vass2015-09-232-10/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clean up: show usage when global --help present
| * | | | | | Clean up: show usage when global --help presentLei Jitang2015-09-232-10/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Lei Jitang <leijitang@huawei.com>
* | | | | | Merge pull request #16371 from coolljt0725/docs_update_contributingJess Frazelle2015-09-231-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Docs: update the CONTRIBUTING.md
| * | | | | | Docs: update the CONTRIBUTING.mdLei Jitang2015-09-171-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell user not to add random `+1` Remove unecessary `-D` in `docker info` Signed-off-by: Lei Jitang <leijitang@huawei.com>
* | | | | | | Merge pull request #16500 from sergeyevstifeev/11584-pkg-stdcopy-test-coverageJess Frazelle2015-09-232-1/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adding some more coverage to StdCopy to address #11584
| * | | | | | | Add StdCopy happy path test: both reading and writingSergey Evstifeev2015-09-232-1/+27
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com>
* | | | | | | Merge pull request #16502 from Microsoft/10662-cpuweightJess Frazelle2015-09-234-3/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Windows: [TP4] Add CPU Weight
| * | | | | | | Windows: [TP4] Add CPU WeightJohn Howard2015-09-224-3/+17
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Howard <jhoward@microsoft.com>
* | | | | | | Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cpJess Frazelle2015-09-233-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Docs: correct the description of docker cp
| * | | | | | | Docs: correct the description of docker cpLei Jitang2015-09-203-3/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Lei Jitang <leijitang@huawei.com>
* | | | | | | Merge pull request #16528 from gesellix/docs-container-commitJess Frazelle2015-09-2310-10/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix content-type of response for `/commit`
| * | | | | | | fix content-type of response for `/commit`Tobias Gesellchen2015-09-2310-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
* | | | | | | | Merge pull request #16289 from ↵Jess Frazelle2015-09-232-25/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cpuguy83/11957_fix_stdin_block_after_container_exit Ensure stdin does not block after container stop
| * | | | | | | | Ensure stdin does not block after container stopBrian Goff2015-09-182-25/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11957 Fixes #12319 Also removes check for Darwin when the stdin reader is closed as it doesn't appear to block any more. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* | | | | | | | | Merge pull request #16346 from cpswan/fixes-15792Jess Frazelle2015-09-231-3/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Clarify when keys are created
| * | | | | | | | | Clarify when keys are created and fix missing ofChris Swan2015-09-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Swan <chris.swan@iee.org> Conflicts: docs/security/trust/content_trust.md
* | | | | | | | | | Merge pull request #16518 from unclejack/bump_go_to_1.4.3Jess Frazelle2015-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Dockerfile: bump Go to 1.4.3
| * | | | | | | | | Dockerfile: bump Go to 1.4.3unclejack2015-09-231-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
* | | | | | | | | Merge pull request #15915 from sdurrheimer/masterTibor Vass2015-09-231-59/+195
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Zsh completion updates
| * | | | | | | | | Catchup missing changes for the zsh completionSteve Durrheimer2015-09-191-59/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - felixr/docker-zsh-completion@6ae6279: Add --privileged flag to docker exec command in zsh completion - felixr/docker-zsh-completion@259ea00: Remove -h help flag from subcommands in zsh completion - felixr/docker-zsh-completion@5f77b29: Add docker ps --format flag to zsh completion - felixr/docker-zsh-completion@a1f39f8: Add --config flag to zsh completion - felixr/docker-zsh-completion@6a503b4: Filter zsh completions of inspect command by --type - felixr/docker-zsh-completion@d286ccd: Add --ulimit flag to build command to zsh completion - felixr/docker-zsh-completion@bdc1261: Add support for kernel memory limit in zsh completion - felixr/docker-zsh-completion@c8ce164: Add docker volume command and subcommands in zsh completion - felixr/docker-zsh-completion@7f996bf: Add docker daemon command to zsh completion - felixr/docker-zsh-completion@4ccd292: Be more generic when parsing "docker ps" output. - felixr/docker-zsh-completion@cd0f1b9: Fix container completion by name - felixr/docker-zsh-completion@8bf9041: Use "docker ps --no-trunc" to build completion. - felixr/docker-zsh-completion@b721bbb: Only keep the last name for a running/stopped container - felixr/docker-zsh-completion@6791b3e: Fix "docker run --stop-signal" completion - felixr/docker-zsh-completion@961f628: Try some heuristics to determine the canonical container name Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
* | | | | | | | | | Merge pull request #16525 from icecrime/fix_integration_cliJess Frazelle2015-09-231-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix integration cli
| * | | | | | | | | | Skip TestAppArmorDeniesChmodProcArnaud Porterie2015-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
| * | | | | | | | | | Skip TestRunUnshareProcArnaud Porterie2015-09-231-0/+2
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
View Lorry Controller Status