Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22048 from thaJeztah/docs-update-api-for-labelsv1.8.2 | Vincent Demeester | 2016-04-18 | 2 | -21/+85 |
|\ | |||||
| * | docs: update API for features added in 1.11 | Sebastiaan van Stijn | 2016-04-16 | 2 | -21/+85 |
* | | Merge pull request #22086 from aboch/doc | Vincent Demeester | 2016-04-18 | 1 | -1/+3 |
|\ \ | |||||
| * | | Clarify container external connectivity in multi-network scenario | Alessandro Boch | 2016-04-18 | 1 | -1/+3 |
* | | | Merge pull request #22115 from yorkie/fix/doc-typo | Sebastiaan van Stijn | 2016-04-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | doc: fix typo | yorkie | 2016-04-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #22098 from thaJeztah/cherry-pick-21998 | Vincent Demeester | 2016-04-18 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | runc install path changed from /usr/local/bin to /usr/local/sbin | Tibor Vass | 2016-04-17 | 2 | -2/+2 |
* | | | | Merge pull request #22097 from mavenugo/tp5 | Vincent Demeester | 2016-04-18 | 7 | -20/+74 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Vendoring libnetwork v0.8.0-dev.1 | Madhu Venugopal | 2016-04-17 | 7 | -20/+74 |
|/ / / | |||||
* | | | Merge pull request #22085 from thaJeztah/remove-unused-query-parameter | Sebastiaan van Stijn | 2016-04-16 | 7 | -7/+0 |
|\ \ \ | |||||
| * | | | docs: remove unused "registry" parameter | Sebastiaan van Stijn | 2016-04-16 | 7 | -7/+0 |
| | |/ | |/| | |||||
* | | | Merge pull request #21817 from tkopczynski/20784-builder-dockerfile-support | Vincent Demeester | 2016-04-16 | 2 | -0/+68 |
|\ \ \ | |||||
| * | | | Unit tests for builder/dockerfile/support | Tomasz Kopczynski | 2016-04-16 | 2 | -0/+68 |
* | | | | Merge pull request #20835 from cpuguy83/handle_stats_client_errors | Doug Davis | 2016-04-16 | 4 | -23/+26 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Do not remove containers from stats list on err | Brian Goff | 2016-04-13 | 4 | -23/+26 |
* | | | | Merge pull request #22078 from yongtang/04152016-docs-remote-api-SecurityOpt | Brian Goff | 2016-04-15 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Fix incorrect docs in remote API for the option of `SecurityOpt` | Yong Tang | 2016-04-15 | 2 | -4/+4 |
* | | | | | Merge pull request #21939 from calavera/events_until_past | Brian Goff | 2016-04-15 | 12 | -133/+289 |
|\ \ \ \ \ | |||||
| * | | | | | Get events until a time in the past. | David Calavera | 2016-04-14 | 12 | -133/+289 |
* | | | | | | Merge pull request #22079 from allencloud/fix-typos-in-CHANGELOG | David Calavera | 2016-04-15 | 1 | -10/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix typos in changelog | allencloud | 2016-04-16 | 1 | -10/+10 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #22066 from thaJeztah/fail-on-unsupported-kernels | David Calavera | 2016-04-15 | 1 | -1/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Produce fatal error when running on kernel < 3.10.0 | Sebastiaan van Stijn | 2016-04-15 | 1 | -1/+3 |
* | | | | | | Merge pull request #22050 from tophj-ibm/increase-timeout-stdin-close-test | Alexander Morozov | 2016-04-15 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix flaky test TestRunExitOnStdinClose | Christopher Jones | 2016-04-15 | 1 | -2/+1 |
* | | | | | | | Merge pull request #22009 from rhvgoyal/docker-cp-fix | David Calavera | 2016-04-15 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Mount volumes rprivate for archival and other use cases | Vivek Goyal | 2016-04-15 | 1 | -0/+13 |
* | | | | | | | | Merge pull request #21006 from cpuguy83/volume_inspect_meta | Vincent Demeester | 2016-04-15 | 9 | -4/+62 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow volume drivers to provide a `Status` field | Brian Goff | 2016-04-15 | 9 | -4/+62 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #21633 from tkopczynski/20784-builder-tarsum-tests | Tibor Vass | 2016-04-15 | 1 | -0/+351 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Builder/tarsum unit tests | Tomasz Kopczynski | 2016-03-30 | 1 | -0/+351 |
* | | | | | | | | | Merge pull request #21726 from aaronlehmann/tarsum-filename-normalization | Tõnis Tiigi | 2016-04-15 | 3 | -2/+62 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix build cache false positives when build context tar contains unnormalized ... | Aaron Lehmann | 2016-04-14 | 3 | -2/+62 |
* | | | | | | | | | | Merge pull request #22060 from hqhq/hq_remove_tmp_code | Vincent Demeester | 2016-04-15 | 7 | -14/+28 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove template code for runc and containerd | Qiang Huang | 2016-04-15 | 7 | -14/+28 |
* | | | | | | | | | | Merge pull request #22063 from graingert/patch-1 | Vincent Demeester | 2016-04-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix security documentation, XSS -> CSRF | Thomas Grainger | 2016-04-15 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #20924 from Microsoft/10662-CPUResourceControls | Vincent Demeester | 2016-04-15 | 6 | -4/+39 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add CPU count and maximum resource controls for Windows | Darren Stahl | 2016-04-14 | 6 | -4/+39 |
* | | | | | | | | | Merge pull request #21172 from yongtang/20909-seccomp-in-docker-info | Vincent Demeester | 2016-04-15 | 4 | -1/+20 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Show "seccomp" in docker info (#20909). | Yong Tang | 2016-03-30 | 4 | -1/+20 |
* | | | | | | | | | | Merge pull request #21634 from cpuguy83/add_beter_logging_for_TestDaemonNoSpa... | Vincent Demeester | 2016-04-14 | 1 | -15/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | More logs for `TestDaemonNoSpaceleftOnDeviceError` | Brian Goff | 2016-03-29 | 1 | -15/+16 |
* | | | | | | | | | | | Merge pull request #21861 from jfrazelle/apparmor-examples-for-the-apparmor-gods | Sebastiaan van Stijn | 2016-04-14 | 1 | -23/+158 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add example to apparmor docs | Jess Frazelle | 2016-04-14 | 1 | -23/+158 |
* | | | | | | | | | | | | Merge pull request #22040 from thaJeztah/bump-version-to-v1.12.0-dev | Tibor Vass | 2016-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Bump version to v1.12.0-dev | Sebastiaan van Stijn | 2016-04-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge pull request #22022 from AkihiroSuda/fixunused | David Calavera | 2016-04-14 | 4 | -62/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Clean up unused code | Akihiro Suda | 2016-04-14 | 4 | -62/+1 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |