summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bump version to 1.13.0-rc7v1.13.0-rc7Victor Vieux2017-01-111-1/+1
* Merge pull request #30116 from vieux/cherry-pick-1.13.0-rc7Victor Vieux2017-01-124-9/+49
|\
| * Add test for image size for v1.12 and v1.13 clients against v1.13 daemonYong Tang2017-01-111-0/+36
| * Fix ImageSummary.Size valueKenfe-Mickael Laventure2017-01-112-8/+4
| * storeLayer.Parent should return describableStoreLayersStefan J. Wernli2017-01-111-1/+9
|/
* bump version to 1.13.0-rc6v1.13.0-rc6Victor Vieux2017-01-112-2/+2
* Merge pull request #30044 from tonistiigi/update-runc-113Tõnis Tiigi2017-01-113-2/+7
|\
| * vendor: update runc to 2f7393a4Tonis Tiigi2017-01-103-2/+7
* | Merge pull request #30042 from aaronlehmann/vendor-swarmkit-296fcfcMadhu Venugopal2017-01-104-16/+11
|\ \ | |/ |/|
| * Modify network plugin test for swarm-modeMadhu Venugopal2017-01-101-12/+2
| * Update vendored swarmkit to 296fcfcAaron Lehmann2017-01-103-4/+9
* | Merge pull request #30012 from tiborvass/plugin-devices-redoneVictor Vieux2017-01-105-13/+17
|\ \ | |/ |/|
| * plugins: rename DeviceCreation to AllowAllDevicesTibor Vass2017-01-105-13/+17
|/
* Merge pull request #30034 from aaronlehmann/vendor-swarmkit-70cb786Alexander Morozov2017-01-103-16/+18
|\
| * [1.13] Update vendored swarmkit to 70cb786Aaron Lehmann2017-01-103-16/+18
|/
* Merge pull request #29962 from vieux/1.13.0-rc6-cherrypicksVincent Demeester2017-01-1012-39/+40
|\
| * un-fork go-memdbSebastiaan van Stijn2017-01-091-1/+1
| * vendor: Unfork logrus dependencyAaron Lehmann2017-01-091-1/+1
| * remove -f on secret create and unify usage with other commandsVictor Vieux2017-01-093-22/+8
| * Fix workdir cache invalidationTonis Tiigi2017-01-092-7/+13
| * Add bash completion for plugin namesHarald Albers2017-01-091-1/+10
| * Fix "zsh/_docker"Yunxiang Huang2017-01-091-1/+1
| * Set plugins used in tests back to original namesTonis Tiigi2017-01-093-5/+5
| * Fix wrong command in changelogHarald Albers2017-01-091-1/+1
* | Merge pull request #30009 from thaJeztah/revert-27146Victor Vieux2017-01-094-12/+4
|\ \
| * | Revert "Require continuation char to be last char in a line"Sebastiaan van Stijn2017-01-104-12/+4
* | | Merge pull request #29958 from cpuguy83/1.13_fix_selinux_packagingBrian Goff2017-01-093-24/+2
|\ \ \ | |/ / |/| |
| * | Fix conflicts with newly updated selinux policiesBrian Goff2017-01-063-24/+2
* | | Merge pull request #29994 from vdemeester/29974-fix-external-networkVictor Vieux2017-01-091-9/+21
|\ \ \
| * | | Create only network that are usedVincent Demeester2017-01-091-5/+18
| * | | Fix external network name not properly handle by stack deployVincent Demeester2017-01-091-4/+3
* | | | Merge pull request #30004 from dnephin/fix-1.13-stack-deploy-resourcesVictor Vieux2017-01-092-6/+37
|\ \ \ \
| * | | | Fix parsing resources from compose file for stack deploy.Daniel Nephin2017-01-092-6/+37
| | |/ / | |/| |
* | | | Merge pull request #30007 from aaronlehmann/vendor-swarmkit-8ea08a3Victor Vieux2017-01-092-4/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | [1.13] Update vendored swarmkit to 8ea08a3Aaron Lehmann2017-01-092-4/+2
| | |/ | |/|
* | | Merge pull request #29905 from coolljt0725/cherry-pick-29721Victor Vieux2017-01-092-5/+52
|\ \ \ | |/ / |/| |
| * | Follow up #29365, fix fail to remove container after restartLei Jitang2017-01-052-10/+52
| * | Allow containers to continue even if mount failed after live restoreYong Tang2017-01-051-2/+7
| |/
* | Merge pull request #29895 from cpuguy83/cherry_pick_29893Sebastiaan van Stijn2017-01-071-1/+8
|\ \
| * | Fix race accessing plugin storage mapBrian Goff2017-01-061-1/+8
* | | Merge pull request #29926 from aaronlehmann/vendor-swarmkit-7f910dfBrian Goff2017-01-063-5/+21
|\ \ \ | |_|/ |/| |
| * | [1.13] Revendor swarmkit to 7f910dfAaron Lehmann2017-01-053-5/+21
|/ /
* | bump version to rc5v1.13.0-rc5Victor Vieux2017-01-041-1/+1
* | Merge pull request #29878 from mavenugo/npfilter2Victor Vieux2017-01-041-0/+7
|\ \ | |/ |/|
| * Swarmkit has enabled the plugin filtering logic based on the driversMadhu Venugopal2017-01-041-0/+7
|/
* update URL of plugins_graphdriver.md in experimental/README.mdlixiaobing100512672017-01-031-2/+2
* update plugins in docs and correct things in index.mdallencloud2017-01-032-2/+16
* Update reference document for secret and stackyuexiao-wang2017-01-033-2/+20
* small secret doc updateVictor Vieux2017-01-031-7/+7
* Merge pull request #29866 from vieux/1.13.0-rc5-cherrpicksTibor Vass2017-01-0444-360/+630
|\