summaryrefslogtreecommitdiff
Commit message (Expand)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
|\
| * TestRandomUnixTmpDirPath platform agnosticJohn Howard2015-09-245-14/+23
* | Merge pull request #16541 from sunyuan3/newlogformatDavid Calavera2015-09-241-7/+31
|\ \
| * | Update documentation for new test log format.Yuan Sun2015-09-241-7/+31
* | | Merge pull request #16545 from HuKeping/fixtestDoug Davis2015-09-241-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix test for container eventsHu Keping2015-09-241-1/+1
| |/
* | Merge pull request #16190 from LK4D4/drain_refactorJess Frazelle2015-09-244-112/+253
|\ \
| * | Make bytesPipe use linear allocationsTonis Tiigi2015-09-233-57/+120
| * | Refactor bufReader to use BytesPipeAlexander Morozov2015-09-232-108/+23
| * | Add BytesPipe datastructure to ioutilsAlexander Morozov2015-09-232-0/+163
* | | Merge pull request #15021 from chenchun/resize_poolBrian Goff2015-09-238-17/+69
|\ \ \ | |_|/ |/| |
| * | Try to resize data and metadata loopback file when initiating devicemapperChun Chen2015-09-248-17/+69
* | | Merge pull request #16411 from duglin/DaemonErrorsBrian Goff2015-09-2312-47/+395
|\ \ \
| * | | Move more 'daemon' errors to the new error packageDoug Davis2015-09-2312-47/+395
* | | | Merge pull request #16415 from HuKeping/dockerinfoBrian Goff2015-09-234-42/+57
|\ \ \ \
| * | | | Format output of docker infoHu Keping2015-09-234-42/+57
| |/ / /
* | | | Merge pull request #16540 from MHBauer/man-build-argDavid Calavera2015-09-231-1/+1
|\ \ \ \
| * | | | fix typo in man pageMorgan Bauer2015-09-231-1/+1
|/ / / /
* | | | Merge pull request #16497 from MHBauer/attach-refactor-newJess Frazelle2015-09-232-10/+19
|\ \ \ \
| * | | | refactor attach to not use internal data structuresMorgan Bauer2015-09-232-10/+19
* | | | | Merge pull request #16484 from HuKeping/history-formatJess Frazelle2015-09-231-2/+3
|\ \ \ \ \
| * | | | | Format the output of docker historyHu Keping2015-09-221-2/+3
* | | | | | 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.David Calavera2015-09-222-4/+26
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16504 from brahmaroutu/ImageErrorsTibor Vass2015-09-232-2/+22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Adding error codes to image packageSrini Brahmaroutu2015-09-232-2/+22
* | | | | | Merge pull request #16517 from coolljt0725/show_help_all_the_timeTibor Vass2015-09-232-10/+4
|\ \ \ \ \ \
| * | | | | | Clean up: show usage when global --help presentLei Jitang2015-09-232-10/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #16371 from coolljt0725/docs_update_contributingJess Frazelle2015-09-231-2/+5
|\ \ \ \ \ \
| * | | | | | Docs: update the CONTRIBUTING.mdLei Jitang2015-09-171-2/+5
* | | | | | | Merge pull request #16500 from sergeyevstifeev/11584-pkg-stdcopy-test-coverageJess Frazelle2015-09-232-1/+27
|\ \ \ \ \ \ \
| * | | | | | | Add StdCopy happy path test: both reading and writingSergey Evstifeev2015-09-232-1/+27
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #16502 from Microsoft/10662-cpuweightJess Frazelle2015-09-234-3/+17
|\ \ \ \ \ \ \
| * | | | | | | Windows: [TP4] Add CPU WeightJohn Howard2015-09-224-3/+17
| |/ / / / / /
* | | | | | | Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cpJess Frazelle2015-09-233-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Docs: correct the description of docker cpLei Jitang2015-09-203-3/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #16528 from gesellix/docs-container-commitJess Frazelle2015-09-2310-10/+10
|\ \ \ \ \ \ \
| * | | | | | | fix content-type of response for `/commit`Tobias Gesellchen2015-09-2310-10/+10
* | | | | | | | Merge pull request #16289 from cpuguy83/11957_fix_stdin_block_after_container...Jess Frazelle2015-09-232-25/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure stdin does not block after container stopBrian Goff2015-09-182-25/+42
* | | | | | | | | Merge pull request #16346 from cpswan/fixes-15792Jess Frazelle2015-09-231-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clarify when keys are created and fix missing ofChris Swan2015-09-181-3/+4
* | | | | | | | | | Merge pull request #16518 from unclejack/bump_go_to_1.4.3Jess Frazelle2015-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Dockerfile: bump Go to 1.4.3unclejack2015-09-231-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #15915 from sdurrheimer/masterTibor Vass2015-09-231-59/+195
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Catchup missing changes for the zsh completionSteve Durrheimer2015-09-191-59/+195
* | | | | | | | | | Merge pull request #16525 from icecrime/fix_integration_cliJess Frazelle2015-09-231-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Skip TestAppArmorDeniesChmodProcArnaud Porterie2015-09-231-0/+2
| * | | | | | | | | | Skip TestRunUnshareProcArnaud Porterie2015-09-231-0/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |