summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23132 from mlaventure/bump-to-1.11.2v1.11.21.11.2bump_v1.11.1Sebastiaan van Stijn2016-06-011-1/+1
|\
| * Bump version to 1.11.2Kenfe-Mickael Laventure2016-05-311-1/+1
* | Merge pull request #23176 from mlaventure/increase-containerd-start-timeoutMichael Crosby2016-06-011-1/+1
|\ \
| * | Increase containerd start-timeout to 2 minutesKenfe-Mickael Laventure2016-06-011-1/+1
|/ /
* | Merge pull request #23169 from mlaventure/remove-seccomp-from-ppc-for-1.11.2Sebastiaan van Stijn2016-06-011-1/+1
|\ \
| * | Remove seccomp from DOCKER_BUILDTAGS for ppc64leKenfe-Mickael Laventure2016-06-011-1/+1
|/ /
* | Merge pull request #23164 from thaJeztah/change-clang-versionBrian Goff2016-06-011-9/+2
|\ \ | |/ |/|
| * Use clang 3.5 over 3.8Michael Crosby2016-06-011-9/+2
|/
* Merge pull request #23062 from mlaventure/1.11.2-changelogv1.11.2-rc1Sebastiaan van Stijn2016-05-281-0/+20
|\
| * Update CHANGELOG for 1.11.2Kenfe-Mickael Laventure2016-05-271-0/+20
* | Merge pull request #23029 from mlaventure/bump-to-1.11.2Brian Goff2016-05-281-1/+1
|\ \
| * | Bump version to 1.11.2-rc1Kenfe-Mickael Laventure2016-05-271-1/+1
| |/
* | Merge pull request #23058 from mlaventure/1.11.2-cherry-pickBrian Goff2016-05-2816-53/+275
|\ \ | |/ |/|
| * Fixes Issue # 22992: docker commit failing.Shishir Mahajan2016-05-271-2/+2
| * Enable seccomp on ppc64leJustin Cormack2016-05-273-1/+11
| * Fix directory walker error checkingTonis Tiigi2016-05-271-10/+10
| * Release memoryStore locks before filter/applyTonis Tiigi2016-05-272-19/+14
| * Update port info on network connect/disconnectAlessandro Boch2016-05-273-2/+54
| * Wait for discovery on container start errorBrian Goff2016-05-273-14/+103
| * Bump Go version to 1.6.2 from 1.6.1 where it was usedKen Cochrane2016-05-271-6/+4
| * Add refcounts to graphdrivers that use fsdiffBrian Goff2016-05-274-0/+78
* | Merge pull request #22955 from crosbymichael/containerd-may24Brian Goff2016-05-278-8/+8
|\ \ | |/ |/|
| * Bump containerd to 9dc2b3273db42c75368988a3885a3afMichael Crosby2016-05-248-8/+8
* | Merge pull request #23015 from mavenugo/v1.11.2-lnBrian Goff2016-05-273-2/+5
|\ \
| * | Bumping libnetwork to v0.7.2-rc1Madhu Venugopal2016-05-263-2/+5
| |/
* | Merge pull request #22947 from tonistiigi/fix-already-active-1.11.2Brian Goff2016-05-263-0/+41
|\ \
| * | Fix already active error on restoring from ungraceful restartTonis Tiigi2016-05-263-0/+41
| |/
* | Merge pull request #22998 from mlaventure/update-runc-for-1.11.2Alexander Morozov2016-05-2615-88/+233
|\ \ | |/ |/|
| * Bump runc vendoring to baf6536d6259209c3edfa2b22237af82942d3dfaKenfe-Mickael Laventure2016-05-2615-88/+233
|/
* Merge pull request #22267 from mlaventure/1.11.1-changelogv1.11.1Tibor Vass2016-04-251-0/+35
|\
| * Add changelog for v1.11.1Kenfe-Mickael Laventure2016-04-251-0/+35
* | Merge pull request #22242 from mlaventure/1.11.1-cherry-pickTibor Vass2016-04-2572-490/+764
|\ \
| * | Update runc and spec dependencies for mount labelMrunal Patel2016-04-2511-10/+13
| * | Reset restart timeout if execution longer than 10sMichael Crosby2016-04-257-8/+50
| * | Add default `serveraddress` value in remote API `/auth`Yong Tang2016-04-252-0/+26
| * | fix reloading of daemon labels from configSebastiaan van Stijn2016-04-252-3/+3
| * | Labels set on the command line always override labels in DockerfileYong Tang2016-04-255-47/+110
| * | Use absolute path for rootfs in OCI config.jsonKenfe-Mickael Laventure2016-04-252-19/+18
| * | Bump containerd to v0.2.1Michael Crosby2016-04-2510-158/+186
| * | api: server: check for unauthorized errorAntonio Murdaca2016-04-252-21/+1
| * | Fix config cleanup on canceling restartmanagerTonis Tiigi2016-04-251-3/+7
| * | add pkcs11 build tag to deb and rpm buildsDavid Lawrence2016-04-2515-15/+15
| * | Docker http panics caused by container deletion with empty names.Yong Tang2016-04-252-0/+15
| * | Containerize `TestDaemonNoSpaceLeftOnDeviceError`Brian Goff2016-04-251-19/+17
| * | Initialize activateWait for plugins activated by json specMadhu Venugopal2016-04-252-38/+70
| * | Remove restart canceled errorMichael Crosby2016-04-252-3/+11
| * | Clean up exec fifos on process exitTonis Tiigi2016-04-251-1/+17
| * | Create a copy of stats value before modificationsMichael Crosby2016-04-252-3/+3
| * | Remove deprecation warningSebastiaan van Stijn2016-04-251-5/+1
| * | Don't throw "restartmanager canceled" error for no restart policy containerLei Jitang2016-04-252-1/+4