Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Make 'TestRandomUnixTmpDirPath' platform agnostic"revert-16556-10662-randomunix | Arnaud Porterie | 2015-09-24 | 5 | -23/+14 |
* | Merge pull request #16556 from Microsoft/10662-randomunix | Arnaud Porterie | 2015-09-24 | 5 | -14/+23 |
|\ | |||||
| * | TestRandomUnixTmpDirPath platform agnostic | John Howard | 2015-09-24 | 5 | -14/+23 |
* | | Merge pull request #16541 from sunyuan3/newlogformat | David Calavera | 2015-09-24 | 1 | -7/+31 |
|\ \ | |||||
| * | | Update documentation for new test log format. | Yuan Sun | 2015-09-24 | 1 | -7/+31 |
* | | | Merge pull request #16545 from HuKeping/fixtest | Doug Davis | 2015-09-24 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix test for container events | Hu Keping | 2015-09-24 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #16190 from LK4D4/drain_refactor | Jess Frazelle | 2015-09-24 | 4 | -112/+253 |
|\ \ | |||||
| * | | Make bytesPipe use linear allocations | Tonis Tiigi | 2015-09-23 | 3 | -57/+120 |
| * | | Refactor bufReader to use BytesPipe | Alexander Morozov | 2015-09-23 | 2 | -108/+23 |
| * | | Add BytesPipe datastructure to ioutils | Alexander Morozov | 2015-09-23 | 2 | -0/+163 |
* | | | Merge pull request #15021 from chenchun/resize_pool | Brian Goff | 2015-09-23 | 8 | -17/+69 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Try to resize data and metadata loopback file when initiating devicemapper | Chun Chen | 2015-09-24 | 8 | -17/+69 |
* | | | Merge pull request #16411 from duglin/DaemonErrors | Brian Goff | 2015-09-23 | 12 | -47/+395 |
|\ \ \ | |||||
| * | | | Move more 'daemon' errors to the new error package | Doug Davis | 2015-09-23 | 12 | -47/+395 |
* | | | | Merge pull request #16415 from HuKeping/dockerinfo | Brian Goff | 2015-09-23 | 4 | -42/+57 |
|\ \ \ \ | |||||
| * | | | | Format output of docker info | Hu Keping | 2015-09-23 | 4 | -42/+57 |
| |/ / / | |||||
* | | | | Merge pull request #16540 from MHBauer/man-build-arg | David Calavera | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | fix typo in man page | Morgan Bauer | 2015-09-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #16497 from MHBauer/attach-refactor-new | Jess Frazelle | 2015-09-23 | 2 | -10/+19 |
|\ \ \ \ | |||||
| * | | | | refactor attach to not use internal data structures | Morgan Bauer | 2015-09-23 | 2 | -10/+19 |
* | | | | | Merge pull request #16484 from HuKeping/history-format | Jess Frazelle | 2015-09-23 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Format the output of docker history | Hu Keping | 2015-09-22 | 1 | -2/+3 |
* | | | | | | Merge pull request #16494 from calavera/fix_plugin_url_scheme | Alexandre Beslic | 2015-09-23 | 2 | -4/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not hardcode http as plugin URL scheme for secure connections. | David Calavera | 2015-09-22 | 2 | -4/+26 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #16504 from brahmaroutu/ImageErrors | Tibor Vass | 2015-09-23 | 2 | -2/+22 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Adding error codes to image package | Srini Brahmaroutu | 2015-09-23 | 2 | -2/+22 |
* | | | | | | Merge pull request #16517 from coolljt0725/show_help_all_the_time | Tibor Vass | 2015-09-23 | 2 | -10/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clean up: show usage when global --help present | Lei Jitang | 2015-09-23 | 2 | -10/+4 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #16371 from coolljt0725/docs_update_contributing | Jess Frazelle | 2015-09-23 | 1 | -2/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Docs: update the CONTRIBUTING.md | Lei Jitang | 2015-09-17 | 1 | -2/+5 |
* | | | | | | | Merge pull request #16500 from sergeyevstifeev/11584-pkg-stdcopy-test-coverage | Jess Frazelle | 2015-09-23 | 2 | -1/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add StdCopy happy path test: both reading and writing | Sergey Evstifeev | 2015-09-23 | 2 | -1/+27 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #16502 from Microsoft/10662-cpuweight | Jess Frazelle | 2015-09-23 | 4 | -3/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Windows: [TP4] Add CPU Weight | John Howard | 2015-09-22 | 4 | -3/+17 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp | Jess Frazelle | 2015-09-23 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Docs: correct the description of docker cp | Lei Jitang | 2015-09-20 | 3 | -3/+3 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #16528 from gesellix/docs-container-commit | Jess Frazelle | 2015-09-23 | 10 | -10/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix content-type of response for `/commit` | Tobias Gesellchen | 2015-09-23 | 10 | -10/+10 |
* | | | | | | | | Merge pull request #16289 from cpuguy83/11957_fix_stdin_block_after_container... | Jess Frazelle | 2015-09-23 | 2 | -25/+42 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Ensure stdin does not block after container stop | Brian Goff | 2015-09-18 | 2 | -25/+42 |
* | | | | | | | | | Merge pull request #16346 from cpswan/fixes-15792 | Jess Frazelle | 2015-09-23 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Clarify when keys are created and fix missing of | Chris Swan | 2015-09-18 | 1 | -3/+4 |
* | | | | | | | | | | Merge pull request #16518 from unclejack/bump_go_to_1.4.3 | Jess Frazelle | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Dockerfile: bump Go to 1.4.3 | unclejack | 2015-09-23 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #15915 from sdurrheimer/master | Tibor Vass | 2015-09-23 | 1 | -59/+195 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Catchup missing changes for the zsh completion | Steve Durrheimer | 2015-09-19 | 1 | -59/+195 |
* | | | | | | | | | | Merge pull request #16525 from icecrime/fix_integration_cli | Jess Frazelle | 2015-09-23 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Skip TestAppArmorDeniesChmodProc | Arnaud Porterie | 2015-09-23 | 1 | -0/+2 |
| * | | | | | | | | | | Skip TestRunUnshareProc | Arnaud Porterie | 2015-09-23 | 1 | -0/+2 |
| | |_|_|_|/ / / / / | |/| | | | | | | | |