Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add docker.morphbaserock/v1.0.1 | Paul Sherwood | 2014-06-21 | 1 | -0/+10 |
* | Bump version to v1.0.1v1.0.1 | Victor Vieux | 2014-06-19 | 2 | -1/+24 |
* | Merge pull request #6557 from crosbymichael/update-libcontainer-1.0.1 | Victor Vieux | 2014-06-19 | 11 | -142/+279 |
|\ | |||||
| * | Update libcontainer dep to v1.0.1 | Michael Crosby | 2014-06-19 | 11 | -142/+279 |
|/ | |||||
* | Merge pull request #6554 from tianon/fix-dyntest | Tianon Gravi | 2014-06-19 | 2 | -3/+3 |
|\ | |||||
| * | Fix dyntest and rename it to dyntest-unit to match the test-unit rename | Tianon Gravi | 2014-06-19 | 2 | -3/+3 |
* | | Merge pull request #6527 from subhraveti/cap-whitelist | Victor Vieux | 2014-06-19 | 5 | -72/+66 |
|\ \ | |||||
| * | | Update close fd issues for lxc | Michael Crosby | 2014-06-19 | 2 | -7/+9 |
| * | | Use libcontainer cap drop method | Michael Crosby | 2014-06-19 | 5 | -124/+64 |
| * | | Maintain a whitelist of capabilities rather than droplist | Dinesh Subhraveti | 2014-06-19 | 2 | -31/+83 |
* | | | Merge pull request #6493 from vieux/fix_cp_mac_os | Michael Crosby | 2014-06-19 | 4 | -7/+15 |
|\ \ \ | |||||
| * | | | discard ErrNotSupportedPlatform | Victor Vieux | 2014-06-18 | 1 | -2/+2 |
| * | | | allow utimes on mac os, only lutimes isn't supported | Victor Vieux | 2014-06-17 | 3 | -5/+13 |
* | | | | Merge pull request #6552 from vbatts/vbatts-gh6551 | Tibor Vass | 2014-06-19 | 1 | -0/+5 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | sqlite-3.6.20-1 unique constraint message | Vincent Batts | 2014-06-19 | 1 | -0/+5 |
* | | | | Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tags | Tianon Gravi | 2014-06-19 | 1 | -4/+2 |
|\ \ \ \ | |||||
| * | | | | Update bash-completion to reflect ability to push single tags | Tianon Gravi | 2014-06-19 | 1 | -4/+2 |
* | | | | | Merge pull request #6538 from leeplay/patch-2 | James Turnbull | 2014-06-19 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Update dockerlinks.md | hyeongkyu.lee | 2014-06-19 | 1 | -1/+1 |
* | | | | | | Merge pull request #6451 from cyphar/6445-fix-onbuild-passing-to-grandchildren | unclejack | 2014-06-19 | 2 | -2/+69 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | integration-cli: add build test for NOCACHE | cyphar | 2014-06-19 | 1 | -0/+63 |
| * | | | | | server: buildfile: ensure that ONBUILD triggers aren't committed | cyphar | 2014-06-19 | 1 | -2/+6 |
| |/ / / / | |||||
* | | | | | Merge pull request #6524 from behemphi/patch-1 | James Turnbull | 2014-06-19 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Update dockerizing.md | Boyd Hemphill | 2014-06-18 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #6519 from fredlf/latest-copyedits | James Turnbull | 2014-06-19 | 1 | -28/+27 |
|\ \ \ \ | |||||
| * | | | | Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: f... | Fred Lifton | 2014-06-18 | 1 | -28/+27 |
* | | | | | Merge pull request #6427 from tianon/fix-zsh-completion-mode | Tianon Gravi | 2014-06-18 | 1 | -0/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix mode on contrib/completion/zsh/_docker (-x) | Tianon Gravi | 2014-06-18 | 1 | -0/+0 |
|/ / / / | |||||
* | | | | Merge pull request #6363 from proppy/patch-5 | Solomon Hykes | 2014-06-18 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | MAINTAINERS: add proppy for google.md | Johan Euphrosine | 2014-06-11 | 1 | -0/+1 |
* | | | | | Merge pull request #6518 from vieux/finish_remove_insert | Tibor Vass | 2014-06-18 | 5 | -37/+0 |
|\ \ \ \ \ | |||||
| * | | | | | cleanup all mentions of insert | Victor Vieux | 2014-06-18 | 5 | -37/+0 |
* | | | | | | Merge pull request #6424 from tianon/fix-minor-md2man-bug | Sven Dowideit | 2014-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib... | Tianon Gravi | 2014-06-14 | 1 | -1/+1 |
* | | | | | | Merge pull request #6517 from ostezer/docs-styles-update | O.S. Tezer | 2014-06-18 | 1 | -9/+43 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Docs styling update/upgrade | O.S. Tezer | 2014-06-18 | 1 | -9/+43 |
* | | | | | | | Merge pull request #6488 from crosbymichael/readme-security | Sven Dowideit | 2014-06-19 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Wrap lines in security notice | Michael Crosby | 2014-06-18 | 1 | -1/+3 |
| * | | | | | | | Add security message to readme | Michael Crosby | 2014-06-17 | 1 | -0/+4 |
* | | | | | | | | Merge pull request #6257 from proppy/test-conntimeout | Victor Vieux | 2014-06-18 | 1 | -0/+33 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | utils: add test for TimeoutConn | Johan Euphrosine | 2014-06-07 | 1 | -0/+33 |
* | | | | | | | | Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-path | Victor Vieux | 2014-06-18 | 4 | -46/+138 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | fix bug in getRootResourcePath in previous commit | Tibor Vass | 2014-06-18 | 1 | -16/+2 |
| * | | | | | | | daemon: *: updated getResourcePath and getRootResourcePath signatures | cyphar | 2014-06-18 | 2 | -32/+107 |
| * | | | | | | | expose unresolved path for volumes and resolve symlink in container.getResour... | Tibor Vass | 2014-06-18 | 2 | -3/+7 |
| * | | | | | | | rename TestVolumeWithSymlink to TestCreateVolumeWithSymlink and remove run_te... | Tibor Vass | 2014-06-18 | 2 | -14/+11 |
| * | | | | | | | add integration test | Tibor Vass | 2014-06-18 | 1 | -0/+30 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #6505 from vdloo/master | Victor Vieux | 2014-06-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixes typo in loopback device error message | Rick van de Loo | 2014-06-18 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bug | Michael Crosby | 2014-06-18 | 3 | -1/+71 |
|\ \ \ \ \ \ \ \ |