Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump to 0.7.0-rc7v0.7.0-rc7 | Michael Crosby | 2013-11-21 | 1 | -1/+1 |
* | Merge branch 'master' into 0.6.5-dm-plugin | Michael Crosby | 2013-11-21 | 15 | -403/+536 |
|\ | |||||
| * | Merge pull request #2798 from dotcloud/fix_state_race | Michael Crosby | 2013-11-21 | 10 | -95/+139 |
| |\ | |||||
| | * | Refactor State to be 100% thread safe | Guillaume J. Charmes | 2013-11-21 | 10 | -95/+139 |
| * | | Merge pull request #2678 from cxmcc/minor | Michael Crosby | 2013-11-21 | 1 | -5/+2 |
| |\ \ | |||||
| | * | | Minor code simplification for Containers api | Xiuming Chen | 2013-11-13 | 1 | -5/+2 |
| * | | | Merge pull request #2488 from viirya/fix_container_volumes_delete | Michael Crosby | 2013-11-21 | 1 | -1/+16 |
| |\ \ \ | |||||
| | * | | | use Binds key in hostConfig to detect volumes mounted from external. | Liang-Chi Hsieh | 2013-11-13 | 1 | -6/+17 |
| | * | | | skip the volumes mounted when deleting the volumes of container. | Liang-Chi Hsieh | 2013-11-13 | 1 | -2/+6 |
| | |/ / | |||||
| * | | | Merge pull request #2304 from unclejack/fix_layer_size_computation | Michael Crosby | 2013-11-21 | 2 | -5/+44 |
| |\ \ \ | |||||
| | * | | | fix container size computation: handle hard links | unclejack | 2013-11-19 | 1 | -4/+30 |
| | * | | | fix layer size computation: handle hard links | unclejack | 2013-11-19 | 1 | -1/+14 |
| * | | | | Merge pull request #2731 from SvenDowideit/docker-commit-doc | Victor Vieux | 2013-11-21 | 2 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | make the docker commit help more copy&pasteable | Sven Dowideit | 2013-11-16 | 2 | -3/+3 |
| * | | | | | Merge pull request #2772 from bitoiu/patch-3 | Andy Rothfusz | 2013-11-21 | 1 | -6/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Change to documentation for AWS AMI request | Vitor Monteiro | 2013-11-19 | 1 | -6/+4 |
| * | | | | | | Merge pull request #2717 from metalivedev/2342-uploadingcontext | Andy Rothfusz | 2013-11-21 | 2 | -27/+92 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix #2342. Harmonize information about ADD. Cross-link build info. | Andy Rothfusz | 2013-11-19 | 2 | -27/+92 |
| * | | | | | | | Merge pull request #2799 from rosenhouse/patch-1 | Andy Rothfusz | 2013-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix title on doc page for remote_api_client_libraries.rst | Gabe Rosenhouse | 2013-11-21 | 1 | -1/+1 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #2763 from dotcloud/use_full_id_delete | Guillaume J. Charmes | 2013-11-21 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Do ont truncate ID on docker rmi | Victor Vieux | 2013-11-18 | 1 | -2/+2 |
| * | | | | | | | | Merge pull request #2805 from pmorie/typo | Guillaume J. Charmes | 2013-11-21 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix typo in pullImage | Paul Morie | 2013-11-21 | 1 | -5/+5 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #2794 from dotcloud/fix_status_code_and_usage | Guillaume J. Charmes | 2013-11-21 | 2 | -249/+252 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Return status exit status 2 on usage, move parserun into commands.go, display... | Victor Vieux | 2013-11-21 | 2 | -249/+252 |
| * | | | | | | | | Merge pull request #2797 from crosbymichael/revert-exit-lock | Guillaume J. Charmes | 2013-11-21 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Revert "Lock state before we modify." | Michael Crosby | 2013-11-21 | 1 | -2/+0 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-race | Victor Vieux | 2013-11-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Lock state before we modify. | Paul Nasrat | 2013-11-21 | 1 | -0/+2 |
* | | | | | | | | | Merge pull request #62 from shykes/devmapper-unit-tests | Michael Crosby | 2013-11-21 | 9 | -144/+856 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Forbid syscalls in tests, add 2 new unit tests | Guillaume J. Charmes | 2013-11-21 | 3 | -24/+316 |
| * | | | | | | | | | Devmapper: test driver initialization and its interaction with libdevmapper | Solomon Hykes | 2013-11-21 | 1 | -19/+225 |
| * | | | | | | | | | Devmapper: wrap calls to os/exec for easier mocking | Solomon Hykes | 2013-11-21 | 2 | -3/+7 |
| * | | | | | | | | | devmapper: skip test which are not unit tests | Solomon Hykes | 2013-11-21 | 2 | -0/+19 |
| * | | | | | | | | | Devmapper: mock all calls to libdevmapper in the unit tests, and deny them by... | Solomon Hykes | 2013-11-20 | 2 | -14/+76 |
| * | | | | | | | | | Devmapper: remove deprecated test helpers | Solomon Hykes | 2013-11-20 | 2 | -9/+0 |
| * | | | | | | | | | devmapper: fix typo | Solomon Hykes | 2013-11-20 | 2 | -2/+2 |
| * | | | | | | | | | Add devmapper struct doc | Guillaume J. Charmes | 2013-11-20 | 1 | -0/+106 |
| * | | | | | | | | | Remove os from devmapper | Guillaume J. Charmes | 2013-11-20 | 6 | -44/+52 |
| * | | | | | | | | | Remove all syscall calls from devicemapper | Guillaume J. Charmes | 2013-11-20 | 6 | -48/+57 |
| * | | | | | | | | | Mock calls to system functions to facilitate unit testing | Solomon Hykes | 2013-11-20 | 4 | -10/+25 |
* | | | | | | | | | | Merge pull request #63 from tianon/flag-help-consistency | Victor Vieux | 2013-11-21 | 1 | -11/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update a few flag help strings for consistency and clarity | Tianon Gravi | 2013-11-21 | 1 | -11/+11 |
* | | | | | | | | | | | Update ImageExport after merge fail | Michael Crosby | 2013-11-21 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'master' into 0.6.5-dm-plugin | Michael Crosby | 2013-11-21 | 4 | -89/+156 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #2793 from crosbymichael/offline-ids | Victor Vieux | 2013-11-21 | 3 | -79/+107 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Allow images to be saved and loaded by id and repository | Michael Crosby | 2013-11-20 | 3 | -79/+107 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #2727 from SvenDowideit/docker-images-doc | Andy Rothfusz | 2013-11-20 | 2 | -6/+40 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | add some common examples for docker images, and tell the user what -a filters... | Sven Dowideit | 2013-11-16 | 2 | -6/+40 |
| | | |_|_|_|/ / / | | |/| | | | | | |