summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump to 0.7.0-rc7v0.7.0-rc7Michael Crosby2013-11-211-1/+1
* Merge branch 'master' into 0.6.5-dm-pluginMichael Crosby2013-11-2115-403/+536
|\
| * Merge pull request #2798 from dotcloud/fix_state_raceMichael Crosby2013-11-2110-95/+139
| |\
| | * Refactor State to be 100% thread safeGuillaume J. Charmes2013-11-2110-95/+139
| * | Merge pull request #2678 from cxmcc/minorMichael Crosby2013-11-211-5/+2
| |\ \
| | * | Minor code simplification for Containers apiXiuming Chen2013-11-131-5/+2
| * | | Merge pull request #2488 from viirya/fix_container_volumes_deleteMichael Crosby2013-11-211-1/+16
| |\ \ \
| | * | | use Binds key in hostConfig to detect volumes mounted from external.Liang-Chi Hsieh2013-11-131-6/+17
| | * | | skip the volumes mounted when deleting the volumes of container.Liang-Chi Hsieh2013-11-131-2/+6
| | |/ /
| * | | Merge pull request #2304 from unclejack/fix_layer_size_computationMichael Crosby2013-11-212-5/+44
| |\ \ \
| | * | | fix container size computation: handle hard linksunclejack2013-11-191-4/+30
| | * | | fix layer size computation: handle hard linksunclejack2013-11-191-1/+14
| * | | | Merge pull request #2731 from SvenDowideit/docker-commit-docVictor Vieux2013-11-212-3/+3
| |\ \ \ \
| | * | | | make the docker commit help more copy&pasteableSven Dowideit2013-11-162-3/+3
| * | | | | Merge pull request #2772 from bitoiu/patch-3Andy Rothfusz2013-11-211-6/+4
| |\ \ \ \ \
| | * | | | | Change to documentation for AWS AMI requestVitor Monteiro2013-11-191-6/+4
| * | | | | | Merge pull request #2717 from metalivedev/2342-uploadingcontextAndy Rothfusz2013-11-212-27/+92
| |\ \ \ \ \ \
| | * | | | | | Fix #2342. Harmonize information about ADD. Cross-link build info.Andy Rothfusz2013-11-192-27/+92
| * | | | | | | Merge pull request #2799 from rosenhouse/patch-1Andy Rothfusz2013-11-211-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix title on doc page for remote_api_client_libraries.rstGabe Rosenhouse2013-11-211-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #2763 from dotcloud/use_full_id_deleteGuillaume J. Charmes2013-11-211-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Do ont truncate ID on docker rmiVictor Vieux2013-11-181-2/+2
| * | | | | | | | Merge pull request #2805 from pmorie/typoGuillaume J. Charmes2013-11-211-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix typo in pullImagePaul Morie2013-11-211-5/+5
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2794 from dotcloud/fix_status_code_and_usageGuillaume J. Charmes2013-11-212-249/+252
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Return status exit status 2 on usage, move parserun into commands.go, display...Victor Vieux2013-11-212-249/+252
| * | | | | | | | Merge pull request #2797 from crosbymichael/revert-exit-lockGuillaume J. Charmes2013-11-211-2/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Revert "Lock state before we modify."Michael Crosby2013-11-211-2/+0
| |/ / / / / / /
| * | | | | | | Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-raceVictor Vieux2013-11-211-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Lock state before we modify.Paul Nasrat2013-11-211-0/+2
* | | | | | | | | Merge pull request #62 from shykes/devmapper-unit-testsMichael Crosby2013-11-219-144/+856
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Forbid syscalls in tests, add 2 new unit testsGuillaume J. Charmes2013-11-213-24/+316
| * | | | | | | | | Devmapper: test driver initialization and its interaction with libdevmapperSolomon Hykes2013-11-211-19/+225
| * | | | | | | | | Devmapper: wrap calls to os/exec for easier mockingSolomon Hykes2013-11-212-3/+7
| * | | | | | | | | devmapper: skip test which are not unit testsSolomon Hykes2013-11-212-0/+19
| * | | | | | | | | Devmapper: mock all calls to libdevmapper in the unit tests, and deny them by...Solomon Hykes2013-11-202-14/+76
| * | | | | | | | | Devmapper: remove deprecated test helpersSolomon Hykes2013-11-202-9/+0
| * | | | | | | | | devmapper: fix typoSolomon Hykes2013-11-202-2/+2
| * | | | | | | | | Add devmapper struct docGuillaume J. Charmes2013-11-201-0/+106
| * | | | | | | | | Remove os from devmapperGuillaume J. Charmes2013-11-206-44/+52
| * | | | | | | | | Remove all syscall calls from devicemapperGuillaume J. Charmes2013-11-206-48/+57
| * | | | | | | | | Mock calls to system functions to facilitate unit testingSolomon Hykes2013-11-204-10/+25
* | | | | | | | | | Merge pull request #63 from tianon/flag-help-consistencyVictor Vieux2013-11-211-11/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update a few flag help strings for consistency and clarityTianon Gravi2013-11-211-11/+11
* | | | | | | | | | | Update ImageExport after merge failMichael Crosby2013-11-211-1/+1
* | | | | | | | | | | Merge branch 'master' into 0.6.5-dm-pluginMichael Crosby2013-11-214-89/+156
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #2793 from crosbymichael/offline-idsVictor Vieux2013-11-213-79/+107
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Allow images to be saved and loaded by id and repositoryMichael Crosby2013-11-203-79/+107
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #2727 from SvenDowideit/docker-images-docAndy Rothfusz2013-11-202-6/+40
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | add some common examples for docker images, and tell the user what -a filters...Sven Dowideit2013-11-162-6/+40
| | | |_|_|_|/ / / | | |/| | | | | |