summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #33810 from thaJeztah/17.03-update-frozen-image-script17.03.xAaron Lehmann2017-07-111-40/+226
|\
| * Merge pull request #33707 from Syntaxide/s3fixTibor Vass2017-06-231-13/+43
| * Merge pull request #33443 from DeliangFan/fix_download_image_failsSebastiaan van Stijn2017-06-231-0/+2
| * Merge pull request #29864 from tianon/schemaVersion-2Vincent Demeester2017-06-231-40/+190
| * Merge pull request #29027 from runcom/fix-jqJustin Cormack2017-06-231-0/+4
* | Merge pull request #33388 from cpuguy83/go1.7.6Sebastiaan van Stijn2017-07-1036-36/+36
|\ \
| * | Bump go version to 1.7.6Brian Goff2017-05-2536-36/+36
* | | Merge pull request #34020 from cpuguy83/17.03_fix_log_readerSebastiaan van Stijn2017-07-102-36/+66
|\ \ \
| * | | Fix log readers can block writes indefinitelyBrian Goff2017-07-082-36/+66
|/ / /
* | | Merge pull request #33971 from andrewhsu/update-containerdAlexander Morozov2017-07-061-1/+1
|\ \ \ | |_|/ |/| |
| * | finish updating binaries-commits containerd to commit 6c46389Andrew Hsu2017-07-061-1/+1
|/ /
* | Merge pull request #33528 from mlaventure/update-containerd-17.03Akihiro Suda2017-06-231-1/+1
|\ \
| * | Update containerd to version 6c463891b1ad274d505ae3bb738e530d1df2b3c7Kenfe-Mickael Laventure2017-06-051-1/+1
* | | Merge pull request #33572 from hsluoyz/patch-1Sebastiaan van Stijn2017-06-081-1/+2
|\ \ \ | |/ / |/| |
| * | Add Casbin plugin to the list of Authorization plugins in docs.Yang Luo2017-06-081-1/+2
|/ /
* | Merge pull request #33401 from mlaventure/bump-version-17.03.2v17.03.2-ceBrian Goff2017-06-011-1/+1
|\ \ | |/ |/|
| * Bump version to 17.03.2-ceKenfe-Mickael Laventure2017-05-251-1/+1
|/
* Merge pull request #33339 from cpuguy83/bump_17.03.2v17.03.2-ce-rc1Sebastiaan van Stijn2017-05-242-1/+23
|\
| * Add 17.03.2 CHANGELOGKenfe-Mickael Laventure2017-05-231-0/+22
| * Bump version to 17.03.2-ce-rc1Brian Goff2017-05-221-1/+1
|/
* Merge pull request #33284 from mlaventure/17.03.2-cherry-picksBrian Goff2017-05-192-1/+3
|\
| * profiles: seccomp: allow clock_settime when CAP_SYS_TIME is addedAntonio Murdaca2017-05-182-1/+3
* | Merge pull request #33273 from cpuguy83/update_libnet_vendor_17.03Kenfe-Mickaël Laventure2017-05-183-2/+7
|\ \ | |/
| * Update libnetwork vendorBrian Goff2017-05-183-2/+7
|/
* Merge pull request #33236 from cpuguy83/17.03.2_cherry_picksSebastiaan van Stijn2017-05-178-67/+118
|\
| * add d_type warning to docker info, and optimize outputSebastiaan van Stijn2017-05-161-45/+76
| * Add non-nil check before logging volume errors.Anusha Ragunathan2017-05-161-1/+5
| * Fix panic on error looking up volume driverBrian Goff2017-05-161-1/+1
| * Volumes should have default propagation property "rprivate"Vivek Goyal2017-05-162-8/+10
| * Make sure plugin rootfs is unmounted on upgradedBrian Goff2017-05-162-2/+10
| * Remove undeeded and broken selinux relabel callBrian Goff2017-05-161-4/+0
| * We need to fix labels if the user requests on volumesDan Walsh2017-05-161-6/+14
| * daemon: relabel secrets pathAntonio Murdaca2017-05-161-0/+2
* | Merge pull request #33232 from aaronlehmann/vendor-swarmkit-2591ac3Brian Goff2017-05-162-2/+3
|\ \ | |/ |/|
| * Vendor swarmkit 2591ac3Aaron Lehmann2017-05-162-2/+3
|/
* Merge pull request #33207 from cpuguy83/cherry_pick_mpsec_backportSebastiaan van Stijn2017-05-164-49/+392
|\
| * Fix issue backporting mount spec to pre-1.13 objBrian Goff2017-05-154-49/+392
|/
* Merge pull request #33118 from aaronlehmann/vendor-swarmkit-e680722Victor Vieux2017-05-106-23/+60
|\
| * Vendor swarmkit e68072200ebbba6ce9745b3a3e49fdba3eb71ff8Aaron Lehmann2017-05-096-23/+60
* | Merge pull request #33120 from cpuguy83/backport_lazy-unmount-volumeVictor Vieux2017-05-105-7/+53
|\ \
| * | Use lazy unmount for local volume unmountBrian Goff2017-05-094-1/+22
| * | Ensure unmount before removing local volume.Brian Goff2017-05-092-7/+32
| |/
* | Merge pull request #33117 from aaronlehmann/digest-pin-context-17.03Sebastiaan van Stijn2017-05-102-0/+21
|\ \ | |/ |/|
| * cluster: Renew the context after communicating with the registryAaron Lehmann2017-03-152-0/+21
* | Merge pull request #33028 from thaJeztah/17.03-remove-unused-filter-paramBrian Goff2017-05-051-24/+0
|\ \
| * | Remove unused filter params from SwaggerSebastiaan van Stijn2017-05-041-24/+0
|/ /
* | Merge pull request #32804 from bbodenmiller/patch-1Doug Davis2017-04-281-1/+1
|\ \
| * | remove extra wordBen Bodenmiller2017-04-281-1/+1
* | | Merge pull request #32724 from PatrickLang/patricklang-win-memoryVincent Demeester2017-04-261-0/+35
|\ \ \
| * | | Adding description for -m, --memoryPatrick Lang2017-04-251-0/+35
View Lorry Controller Status