summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #239 from seemethere/bundle_me_up_1806v18.06.2-ceAndrew Hsu2019-02-063-1/+18
|\
| * Switch from applying patches a git bundleEli Uriegas2019-02-063-1/+18
|/
* Merge pull request #102 from andrewhsu/grpc1806Andrew Hsu2018-10-313-5/+13
|\
| * cluster: set bigger grpc limit for array requestsTonis Tiigi2018-10-303-5/+13
|/
* Merge pull request #34 from thaJeztah/18.06-backport-logissuev18.06.1-ceSebastiaan van Stijn2018-08-161-3/+17
|\
| * Select polling based watcher for Windows log watcherTejaswini Duggaraju2018-08-141-3/+17
* | Merge pull request #31 from thaJeztah/18.06-backport-jjh.37562Sebastiaan van Stijn2018-08-161-21/+30
|\ \
| * | Don't invoke HCS shutdown if terminate calledJohn Howard2018-08-041-21/+30
* | | Merge pull request #33 from thaJeztah/18.06-update-containerdv18.06.1-ce-rc2Andrew Hsu2018-08-141-1/+1
|\ \ \ | |_|/ |/| |
| * | Bump containerd daemon to v1.1.2Sebastiaan van Stijn2018-08-081-1/+1
|/ /
* | Merge pull request #25 from thaJeztah/18.06-backport-error_when_base_name_res...v18.06.1-ce-rc1Andrew Hsu2018-08-072-2/+24
|\ \
| * | Return error if basename is expanded to blankYuichiro Kaneko2018-08-062-2/+24
| |/
* | Merge pull request #21 from tiborvass/18.06-vendor-buildkitAndrew Hsu2018-08-0763-1426/+3946
|\ \
| * | validate: please vetTibor Vass2018-07-202-4/+4
| * | builder: set buildkit's exported product variable via PRODUCTTibor Vass2018-07-206-3/+15
| * | vendor: buildkit to 98f1604134f945d48538ffca0e18662337b4a850Tibor Vass2018-07-2055-1419/+3927
| |/
* | Merge pull request #32 from thaJeztah/18.06-bump_swarmkitAndrew Hsu2018-08-069-50/+71
|\ \
| * | Bump SwarmKit to 8852e8840e30d69db0b39a4a3d6447362e17c64fSebastiaan van Stijn2018-08-069-50/+71
| |/
* | Merge pull request #29 from thaJeztah/18.06-disable-criAndrew Hsu2018-08-061-0/+4
|\ \ | |/ |/|
| * 18.06: disable containerd CRI pluginSebastiaan van Stijn2018-07-311-0/+4
|/
* Merge pull request #26 from thaJeztah/18.06-backport-fix_TestExternalGraphDri...v18.06.0-ceAndrew Hsu2018-07-181-2/+2
|\
| * Fix flaky TestExternalGraphDriver/pull testSebastiaan van Stijn2018-07-171-2/+2
* | Merge pull request #22 from thaJeztah/18.06-backport-errorfixAndrew Hsu2018-07-181-0/+1
|\ \
| * | Fix error string in docker CLI testSandeep Bansal2018-07-121-0/+1
* | | Merge pull request #27 from thaJeztah/18.06-backport-bump_swarmkitAndrew Hsu2018-07-184-3/+26
|\ \ \ | |_|/ |/| |
| * | Update swarmkit to 68266392a176434d282760d2d6d0ab4c68edcae6Sebastiaan van Stijn2018-07-174-3/+26
|/ /
* | Merge pull request #24 from thaJeztah/18.06-backport-fix-internalAndrew Hsu2018-07-161-2/+2
|\ \
| * | Fix flakyness in TestDockerNetworkInternalModeFlavio Crisciani2018-07-151-2/+2
|/ /
* | Merge pull request #20 from thaJeztah/18.06-backport-do_not_Healthcheck_RUN_c...v18.06.0-ce-rc3Andrew Hsu2018-07-113-1/+75
|\ \ | |/ |/|
| * Ensure RUN instruction to run without HealthcheckYuichiro Kaneko2018-07-113-1/+75
* | Merge pull request #19 from thaJeztah/18.06-backport-bump_libnetworkSebastiaan van Stijn2018-07-113-18/+12
|\ \
| * | Bump libnetwork to d00ceed44cc447c77f25cdf5d59e83163bdcb4c9Sebastiaan van Stijn2018-07-113-18/+12
| |/
* | Merge pull request #18 from tiborvass/18.06-mountable-bugfixSebastiaan van Stijn2018-07-112-30/+51
|\ \ | |/ |/|
| * builder: fix duplicate calls to mountableTonis Tiigi2018-07-112-30/+51
|/
* Merge pull request #17 from thaJeztah/18.06-backport-bump_containerd_1.1.1Andrew Hsu2018-07-101-1/+1
|\
| * Bump containerd daemon to v1.1.1Brian Goff2018-07-101-1/+1
* | Merge pull request #15 from thaJeztah/18.06-backport-vendor-containerdAndrew Hsu2018-07-1024-85/+271
|\ \
| * | vendor: update containerd to b41633746Tonis Tiigi2018-07-0924-85/+271
* | | Merge pull request #16 from thaJeztah/18.06-backport-scalable-lbAndrew Hsu2018-07-1055-674/+892
|\ \ \ | |_|/ |/| |
| * | Bump libnetwork to 3ac297bcChris Telfer2018-07-0942-165/+337
| * | Update moby to use scalable-lb libnetwork APIsChris Telfer2018-07-091-36/+2
| * | bump libnetwork to b0186632Chris Telfer2018-07-0920-481/+561
| |/
* | Merge pull request #11 from thaJeztah/18.06-fix_bindmount_src_create_raceAndrew Hsu2018-07-092-0/+15
|\ \ | |/ |/|
| * Fix bindmount autocreate raceBrian Goff2018-07-052-0/+15
* | Merge pull request #13 from thaJeztah/18.06-backport_bump-swarmkitAndrew Hsu2018-07-086-36/+548
|\ \
| * | Bump swarmkit to include task reaper fixes and more metrics.Ying Li2018-07-066-36/+548
| |/
* | Merge pull request #14 from thaJeztah/18.06-backport-CVE-2018-10892Andrew Hsu2018-07-061-0/+1
|\ \ | |/ |/|
| * Add /proc/acpi to masked pathsAntonio Murdaca2018-07-061-0/+1
|/
* Merge pull request #4 from thaJeztah/18.06-backport-register-oci-mediatypesv18.06.0-ce-rc2Andrew Hsu2018-07-052-0/+47
|\
| * Register OCI image media typesDerek McGowan2018-07-032-0/+47
View Lorry Controller Status