summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-bootJess Frazelle2015-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do not try to guess "docker" in Debian SysV init scriptMatthias Rampke2015-09-231-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #16503 from carolfh/image-magmoxiegirl2015-09-231-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed jira DTR-1173 typo in link and additional editsCarol Fager-Higgins2015-09-231-6/+6
* | | | | | | | | | | Merge pull request #16493 from cpuguy83/doc_plugin_rpcgenTibor Vass2015-09-232-1/+69
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add README for pluginrpc-genBrian Goff2015-09-222-1/+69
* | | | | | | | | | | Merge pull request #16522 from jfrazelle/zypper-wtafJess Frazelle2015-09-232-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix zypper BS wrt interactiveJessica Frazelle2015-09-232-4/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #16328 from jfrazelle/opensuse-rpmsDavid Calavera2015-09-225-7/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add opensuse to rpm builderJessica Frazelle2015-09-155-7/+45
* | | | | | | | | | | Merge pull request #16492 from albers/completion-compopt-macDavid Calavera2015-09-221-16/+22
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bash completion: avoid 'compopt: command not found' errors on Mac OSHarald Albers2015-09-221-16/+22
* | | | | | | | | | | Merge pull request #16331 from calavera/server_middlewaresPhil Estes2015-09-225-59/+274
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Organize server pre-func logic in middlewares.David Calavera2015-09-215-59/+274
* | | | | | | | | | | Merge pull request #16312 from Microsoft/10662-startwindowscliBrian Goff2015-09-226-107/+381
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Windows: First part of CI tests (docker run)John Howard2015-09-226-107/+381
* | | | | | | | | | | | Merge pull request #16235 from HuKeping/oom-eventDavid Calavera2015-09-2211-21/+141
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Events for OOM needs to be shift to an earlier timeHu Keping2015-09-2111-21/+141
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #16428 from charleswhchan/fix-logs-docmoxiegirl2015-09-221-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Touch up 'docker logs' documentation.Charles Chan2015-09-211-4/+4
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #16444 from fgimenez/11584-pkg-stdcopy-test-coverageAntonio Murdaca2015-09-221-0/+36
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Added tests for StdWriter.Write.Federico Gimenez2015-09-221-0/+36
* | | | | | | | | | | Merge pull request #15864 from dmcgowan/notary-offlineDavid Calavera2015-09-213-7/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ignore ping errors in notary repository setupDerek McGowan2015-09-143-7/+56
* | | | | | | | | | | | Merge pull request #16419 from HuKeping/commentsAlexandre Beslic2015-09-212-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Comment: add description for some code which hard to understandHu Keping2015-09-222-1/+8
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #16400 from albers/completion-log-opt-tagsDavid Calavera2015-09-211-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | bash completion: use generic `tag` log driver optionHarald Albers2015-09-181-3/+3
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #16457 from Microsoft/10662-blockargBrian Goff2015-09-213-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Windows: Nice error on ARG (builder)John Howard2015-09-213-11/+18
* | | | | | | | | | | | | Merge pull request #16465 from albers/reference-capability-allTibor Vass2015-09-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reference: capability `all` should be `ALL`Harald Albers2015-09-211-1/+1
* | | | | | | | | | | | | | Merge pull request #16461 from tomdee/libnetwork-routes-fixesTibor Vass2015-09-219-26/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Vendoring libnetworkTom Denham2015-09-219-26/+52
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #16466 from runcom/15876-fix-TestRunWithKernelMemoryTibor Vass2015-09-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | daemon: execdriver: lxc: fix wrong template value passed to lxc confAntonio Murdaca2015-09-211-2/+2
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #16404 from duglin/FixRenameErrorEvan Hazlett2015-09-213-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix 'rename' error msg and error checkingDoug Davis2015-09-183-3/+16
* | | | | | | | | | | | | | | Merge pull request #16413 from sunyuan3/TestRunSwapMoreThanMemoryLimitEvan Hazlett2015-09-211-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add the TestRunSwapLessThanMemoryLimit case.Yuan Sun2015-09-211-0/+12
* | | | | | | | | | | | | | | | Merge pull request #16432 from calavera/volume_storeTibor Vass2015-09-2111-182/+456
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Move volume ref counting store to a package.David Calavera2015-09-2111-182/+456
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #16437 from runcom/invalid-logger-addressTibor Vass2015-09-214-61/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | api: server: container: fix wrong commentAntonio Murdaca2015-09-211-1/+5
| * | | | | | | | | | | | | | | daemon: logger: error out on daemon start if invalid logger addressAntonio Murdaca2015-09-203-60/+84
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #15029 from azurezk/add-version-infoAlexandre Beslic2015-09-218-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | add docker server version to /infoZhang Kun2015-09-218-1/+9
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #16449 from runcom/add-container-label-userguidemoxiegirl2015-09-211-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | docs: userguide: add container labels sectionAntonio Murdaca2015-09-211-1/+13
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #16440 from runcom/tempdir-check-errsAlexandre Beslic2015-09-211-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |