summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add docker.morphbaserock/v1.0.1Paul Sherwood2014-06-211-0/+10
* Bump version to v1.0.1v1.0.1Victor Vieux2014-06-192-1/+24
* Merge pull request #6557 from crosbymichael/update-libcontainer-1.0.1Victor Vieux2014-06-1911-142/+279
|\
| * Update libcontainer dep to v1.0.1Michael Crosby2014-06-1911-142/+279
|/
* Merge pull request #6554 from tianon/fix-dyntestTianon Gravi2014-06-192-3/+3
|\
| * Fix dyntest and rename it to dyntest-unit to match the test-unit renameTianon Gravi2014-06-192-3/+3
* | Merge pull request #6527 from subhraveti/cap-whitelistVictor Vieux2014-06-195-72/+66
|\ \
| * | Update close fd issues for lxcMichael Crosby2014-06-192-7/+9
| * | Use libcontainer cap drop methodMichael Crosby2014-06-195-124/+64
| * | Maintain a whitelist of capabilities rather than droplistDinesh Subhraveti2014-06-192-31/+83
* | | Merge pull request #6493 from vieux/fix_cp_mac_osMichael Crosby2014-06-194-7/+15
|\ \ \
| * | | discard ErrNotSupportedPlatformVictor Vieux2014-06-181-2/+2
| * | | allow utimes on mac os, only lutimes isn't supportedVictor Vieux2014-06-173-5/+13
* | | | Merge pull request #6552 from vbatts/vbatts-gh6551Tibor Vass2014-06-191-0/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | sqlite-3.6.20-1 unique constraint messageVincent Batts2014-06-191-0/+5
* | | | Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tagsTianon Gravi2014-06-191-4/+2
|\ \ \ \
| * | | | Update bash-completion to reflect ability to push single tagsTianon Gravi2014-06-191-4/+2
* | | | | Merge pull request #6538 from leeplay/patch-2James Turnbull2014-06-191-1/+1
|\ \ \ \ \
| * | | | | Update dockerlinks.mdhyeongkyu.lee2014-06-191-1/+1
* | | | | | Merge pull request #6451 from cyphar/6445-fix-onbuild-passing-to-grandchildrenunclejack2014-06-192-2/+69
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | integration-cli: add build test for NOCACHEcyphar2014-06-191-0/+63
| * | | | | server: buildfile: ensure that ONBUILD triggers aren't committedcyphar2014-06-191-2/+6
| |/ / / /
* | | | | Merge pull request #6524 from behemphi/patch-1James Turnbull2014-06-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update dockerizing.mdBoyd Hemphill2014-06-181-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #6519 from fredlf/latest-copyeditsJames Turnbull2014-06-191-28/+27
|\ \ \ \
| * | | | Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: f...Fred Lifton2014-06-181-28/+27
* | | | | Merge pull request #6427 from tianon/fix-zsh-completion-modeTianon Gravi2014-06-181-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix mode on contrib/completion/zsh/_docker (-x)Tianon Gravi2014-06-181-0/+0
|/ / / /
* | | | Merge pull request #6363 from proppy/patch-5Solomon Hykes2014-06-181-0/+1
|\ \ \ \
| * | | | MAINTAINERS: add proppy for google.mdJohan Euphrosine2014-06-111-0/+1
* | | | | Merge pull request #6518 from vieux/finish_remove_insertTibor Vass2014-06-185-37/+0
|\ \ \ \ \
| * | | | | cleanup all mentions of insertVictor Vieux2014-06-185-37/+0
* | | | | | Merge pull request #6424 from tianon/fix-minor-md2man-bugSven Dowideit2014-06-191-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib...Tianon Gravi2014-06-141-1/+1
* | | | | | Merge pull request #6517 from ostezer/docs-styles-updateO.S. Tezer2014-06-181-9/+43
|\ \ \ \ \ \
| * | | | | | Docs styling update/upgradeO.S. Tezer2014-06-181-9/+43
* | | | | | | Merge pull request #6488 from crosbymichael/readme-securitySven Dowideit2014-06-191-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Wrap lines in security noticeMichael Crosby2014-06-181-1/+3
| * | | | | | | Add security message to readmeMichael Crosby2014-06-171-0/+4
* | | | | | | | Merge pull request #6257 from proppy/test-conntimeoutVictor Vieux2014-06-181-0/+33
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | utils: add test for TimeoutConnJohan Euphrosine2014-06-071-0/+33
* | | | | | | | Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-pathVictor Vieux2014-06-184-46/+138
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix bug in getRootResourcePath in previous commitTibor Vass2014-06-181-16/+2
| * | | | | | | daemon: *: updated getResourcePath and getRootResourcePath signaturescyphar2014-06-182-32/+107
| * | | | | | | expose unresolved path for volumes and resolve symlink in container.getResour...Tibor Vass2014-06-182-3/+7
| * | | | | | | rename TestVolumeWithSymlink to TestCreateVolumeWithSymlink and remove run_te...Tibor Vass2014-06-182-14/+11
| * | | | | | | add integration testTibor Vass2014-06-181-0/+30
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #6505 from vdloo/masterVictor Vieux2014-06-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixes typo in loopback device error messageRick van de Loo2014-06-181-1/+1
* | | | | | | | Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bugMichael Crosby2014-06-183-1/+71
|\ \ \ \ \ \ \ \