summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25191 from mavenugo/1.12.dlbump_v1.12.0Tibor Vass2016-07-282-2/+3
|\
| * Vendoring libnetwork to avoid a deadlockMadhu Venugopal2016-07-282-2/+3
|/
* Merge pull request #25178 from crosbymichael/bump-restoreTibor Vass2016-07-281-5/+13
|\
| * Check if the container is running if no eventMichael Crosby2016-07-281-5/+13
|/
* Merge pull request #25142 from tiborvass/1.12.0-final-cherry-picksJustin Cormack2016-07-2819-113/+170
|\
| * Vendoring libnetwork to fix #25109Madhu Venugopal2016-07-273-1/+11
| * update rolling update tutorial to reflect default parallelism and update on f...Charles Smith2016-07-271-16/+20
| * Fix daemon panic on restoring containersLei Jitang2016-07-271-0/+2
| * Move directive out of globalsJohn Howard2016-07-279-74/+103
| * Fix files in subdirectories creating bad whiteoutDerek McGowan2016-07-271-1/+2
| * Update diff apply test to check sub directoriesDerek McGowan2016-07-272-3/+27
| * Remove the Require on the socket for the rpmMichael Crosby2016-07-271-1/+0
| * Fix issue with test ordering for TestParseWordsBrian Goff2016-07-272-5/+5
| * Remove bash completion for `docker swarm inspect`Harald Albers2016-07-271-15/+0
| * bash completion for container labels to `service {create,update}`Harald Albers2016-07-271-0/+3
* | Merge pull request #25149 from tiborvass/1.12-changelog-fixTibor Vass2016-07-271-4/+8
|\ \ | |/ |/|
| * Add some ommissions to CHANGELOG and update some swarm commandsTibor Vass2016-07-271-4/+8
* | Merge pull request #25145 from aaronlehmann/remove-join-tokens-from-infoTibor Vass2016-07-275-18/+32
|\ \
| * | Remove join-tokens from the /info APIAaron Lehmann2016-07-275-18/+32
* | | Merge pull request #25140 from stevvooe/service-ps-over-tasks-bump_v1.12.0Tibor Vass2016-07-2728-77/+103
|\ \ \ | |_|/ |/| |
| * | cli: `docker service|node|stack ps` instead of tasksStephen J Day2016-07-2728-77/+103
* | | Merge pull request #25144 from dnephin/remove-extraneous-aliases.bumpTibor Vass2016-07-272-11/+9
|\ \ \
| * | | Remove extraneous mount aliases.Daniel Nephin2016-07-272-11/+9
| | |/ | |/|
* | | Merge pull request #25103 from tiborvass/fix-bad-cherry-pick-infoTibor Vass2016-07-272-217/+14
|\ \ \ | |/ / |/| |
| * | Fix bad cherrypick from a91bc28e6225fb0d943451b8bdafca8b6bbb047dTibor Vass2016-07-262-217/+14
* | | Merge pull request #25114 from SvenDowideit/bump_v1.12.0-docsTibor Vass2016-07-2752-384/+750
|\ \ \ | |_|/ |/| |
| * | Add back links to 1.12 release in deprecated.mdSebastiaan van Stijn2016-07-271-10/+10
| * | Remove release-candidate advisoriesSebastiaan van Stijn2016-07-2723-49/+1
| * | fix minor docs issuesSebastiaan van Stijn2016-07-272-16/+13
| * | fix the ipaddress of an explanation.mapk0y2016-07-271-1/+1
| * | add how services work to how swarm mode works guideCharles Smith2016-07-2710-2/+106
| * | add swarm manage nodes guideCharles Smith2016-07-275-9/+230
| * | add doc for live-restore setting and daemonless containers, fix admin guide menuCharles Smith2016-07-2715-323/+418
| * | Make archive links absoluteSebastiaan van Stijn2016-07-271-2/+2
| * | Update docker_remote_api_v1.22.mdMickaël FORTUNATO2016-07-273-3/+0
| |/
* | Merge pull request #25126 from mlaventure/fix-weird-rpc-lockSebastiaan van Stijn2016-07-271-16/+16
|\ \ | |/ |/|
| * Attach stdin after attach stdout/err to avoid an rpc lockKenfe-Mickael Laventure2016-07-261-16/+16
|/
* Bump VERSION to v1.12.0-rc5v1.12.0-rc5Tibor Vass2016-07-261-1/+1
* Merge pull request #25063 from thaJeztah/man-page-cherryTibor Vass2016-07-263-5/+3
|\
| * Require manpages for packages.Daniel Nephin2016-07-262-4/+2
| * Make manpages in a conatiner.Daniel Nephin2016-07-263-3/+3
|/
* Merge pull request #25058 from tiborvass/additional-cherrypicks-for-1.12.0-rc5Tibor Vass2016-07-2616-144/+184
|\
| * service update: Don't assume existing pointers in spec are validAaron Lehmann2016-07-261-11/+14
| * Address some displaying issues in docker infoTibor Vass2016-07-261-2/+1
| * Remove swarm inspect and use info insteadVincent Demeester2016-07-267-64/+32
| * vendor engine-api to a52656d77f09d394104c1639824eada038bfdb89Tibor Vass2016-07-262-1/+2
| * container/controller: avoid cancellation with forked pull contextStephen J Day2016-07-261-17/+53
| * Vendoring libnetwork to remove stale xfrm statesMadhu Venugopal2016-07-262-3/+3
| * Prevent panic on update --container-label-addTibor Vass2016-07-261-2/+2
| * Add container labels to service create/updateVincent Demeester2016-07-265-48/+81
|/
View Lorry Controller Status