summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22048 from thaJeztah/docs-update-api-for-labelsv1.8.2Vincent Demeester2016-04-182-21/+85
|\
| * docs: update API for features added in 1.11Sebastiaan van Stijn2016-04-162-21/+85
* | Merge pull request #22086 from aboch/docVincent Demeester2016-04-181-1/+3
|\ \
| * | Clarify container external connectivity in multi-network scenarioAlessandro Boch2016-04-181-1/+3
* | | Merge pull request #22115 from yorkie/fix/doc-typoSebastiaan van Stijn2016-04-181-1/+1
|\ \ \
| * | | doc: fix typoyorkie2016-04-181-1/+1
|/ / /
* | | Merge pull request #22098 from thaJeztah/cherry-pick-21998Vincent Demeester2016-04-182-2/+2
|\ \ \
| * | | runc install path changed from /usr/local/bin to /usr/local/sbinTibor Vass2016-04-172-2/+2
* | | | Merge pull request #22097 from mavenugo/tp5Vincent Demeester2016-04-187-20/+74
|\ \ \ \ | |/ / / |/| | |
| * | | Vendoring libnetwork v0.8.0-dev.1Madhu Venugopal2016-04-177-20/+74
|/ / /
* | | Merge pull request #22085 from thaJeztah/remove-unused-query-parameterSebastiaan van Stijn2016-04-167-7/+0
|\ \ \
| * | | docs: remove unused "registry" parameterSebastiaan van Stijn2016-04-167-7/+0
| | |/ | |/|
* | | Merge pull request #21817 from tkopczynski/20784-builder-dockerfile-supportVincent Demeester2016-04-162-0/+68
|\ \ \
| * | | Unit tests for builder/dockerfile/supportTomasz Kopczynski2016-04-162-0/+68
* | | | Merge pull request #20835 from cpuguy83/handle_stats_client_errorsDoug Davis2016-04-164-23/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | Do not remove containers from stats list on errBrian Goff2016-04-134-23/+26
* | | | Merge pull request #22078 from yongtang/04152016-docs-remote-api-SecurityOptBrian Goff2016-04-152-4/+4
|\ \ \ \
| * | | | Fix incorrect docs in remote API for the option of `SecurityOpt`Yong Tang2016-04-152-4/+4
* | | | | Merge pull request #21939 from calavera/events_until_pastBrian Goff2016-04-1512-133/+289
|\ \ \ \ \
| * | | | | Get events until a time in the past.David Calavera2016-04-1412-133/+289
* | | | | | Merge pull request #22079 from allencloud/fix-typos-in-CHANGELOGDavid Calavera2016-04-151-10/+10
|\ \ \ \ \ \
| * | | | | | fix typos in changelogallencloud2016-04-161-10/+10
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22066 from thaJeztah/fail-on-unsupported-kernelsDavid Calavera2016-04-151-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Produce fatal error when running on kernel < 3.10.0Sebastiaan van Stijn2016-04-151-1/+3
* | | | | | Merge pull request #22050 from tophj-ibm/increase-timeout-stdin-close-testAlexander Morozov2016-04-151-2/+1
|\ \ \ \ \ \
| * | | | | | Fix flaky test TestRunExitOnStdinCloseChristopher Jones2016-04-151-2/+1
* | | | | | | Merge pull request #22009 from rhvgoyal/docker-cp-fixDavid Calavera2016-04-151-0/+13
|\ \ \ \ \ \ \
| * | | | | | | Mount volumes rprivate for archival and other use casesVivek Goyal2016-04-151-0/+13
* | | | | | | | Merge pull request #21006 from cpuguy83/volume_inspect_metaVincent Demeester2016-04-159-4/+62
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow volume drivers to provide a `Status` fieldBrian Goff2016-04-159-4/+62
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #21633 from tkopczynski/20784-builder-tarsum-testsTibor Vass2016-04-151-0/+351
|\ \ \ \ \ \ \ \
| * | | | | | | | Builder/tarsum unit testsTomasz Kopczynski2016-03-301-0/+351
* | | | | | | | | Merge pull request #21726 from aaronlehmann/tarsum-filename-normalizationTõnis Tiigi2016-04-153-2/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix build cache false positives when build context tar contains unnormalized ...Aaron Lehmann2016-04-143-2/+62
* | | | | | | | | | Merge pull request #22060 from hqhq/hq_remove_tmp_codeVincent Demeester2016-04-157-14/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove template code for runc and containerdQiang Huang2016-04-157-14/+28
* | | | | | | | | | Merge pull request #22063 from graingert/patch-1Vincent Demeester2016-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix security documentation, XSS -> CSRFThomas Grainger2016-04-151-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20924 from Microsoft/10662-CPUResourceControlsVincent Demeester2016-04-156-4/+39
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add CPU count and maximum resource controls for WindowsDarren Stahl2016-04-146-4/+39
* | | | | | | | | Merge pull request #21172 from yongtang/20909-seccomp-in-docker-infoVincent Demeester2016-04-154-1/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Show "seccomp" in docker info (#20909).Yong Tang2016-03-304-1/+20
* | | | | | | | | | Merge pull request #21634 from cpuguy83/add_beter_logging_for_TestDaemonNoSpa...Vincent Demeester2016-04-141-15/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | More logs for `TestDaemonNoSpaceleftOnDeviceError`Brian Goff2016-03-291-15/+16
* | | | | | | | | | | Merge pull request #21861 from jfrazelle/apparmor-examples-for-the-apparmor-godsSebastiaan van Stijn2016-04-141-23/+158
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add example to apparmor docsJess Frazelle2016-04-141-23/+158
* | | | | | | | | | | | Merge pull request #22040 from thaJeztah/bump-version-to-v1.12.0-devTibor Vass2016-04-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bump version to v1.12.0-devSebastiaan van Stijn2016-04-141-1/+1
* | | | | | | | | | | | | Merge pull request #22022 from AkihiroSuda/fixunusedDavid Calavera2016-04-144-62/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Clean up unused codeAkihiro Suda2016-04-144-62/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |