summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* container limits documentationbuild_limitsJoffrey F2015-04-271-0/+6
* Added unit tests for container limits in buildJoffrey F2015-04-271-0/+19
* * Separate file to store constantsJoffrey F2015-04-273-80/+93
* Merge pull request #568 from docker/exec_reworkJoffrey F2015-04-275-46/+236
|\
| * Updated exec API documentationexec_reworkJoffrey F2015-04-273-17/+44
| * Exec API testsJoffrey F2015-04-274-28/+148
| * Properly implement exec APIJoffrey F2015-04-271-5/+48
|/
* Merge pull request #564 from docker/check_resource_not_noneJoffrey F2015-04-275-5/+69
|\
| * Use custom Error class (inherits DockerException and ValueError)check_resource_not_noneJoffrey F2015-04-272-1/+8
| * Added check_resource decorator to interrupt command if container or image arg...Joffrey F2015-04-244-5/+62
* | Merge pull request #566 from pahaz/patch-1Joffrey F2015-04-271-0/+2
|\ \ | |/ |/|
| * fix(client.py): unification the container argumentPahaz Blinov2015-04-261-0/+2
|/
* Merge pull request #563 from docker/logconfig-supportJoffrey F2015-04-246-8/+118
|\
| * Added tests for log_config paramlogconfig-supportJoffrey F2015-04-242-2/+47
| * Added log_config support in host configJoffrey F2015-04-244-6/+71
* | v2 doesn't have a /_ping endpoint, use /v2/ instead. Fixes #549Joffrey F2015-04-241-1/+1
|/
* Merge pull request #555 from docker/client_side_truncJoffrey F2015-04-223-6/+13
|\
| * Handle ID truncate on client side in containers list (and changed default fro...client_side_truncJoffrey F2015-04-223-6/+13
* | Merge branch 'client_side_trunc'Joffrey F2015-04-221-6/+0
|\ \ | |/
| * revertJoffrey F2015-04-221-6/+0
|/
* Added integration testJoffrey F2015-04-222-0/+35
* Merge pull request #554 from docker/ulimit_supportJoffrey F2015-04-2210-9/+145
|\
| * ulimits: Updated docsulimit_supportJoffrey F2015-04-222-0/+3
| * Improved ulimit testsJoffrey F2015-04-222-1/+26
| * improved Ulimit classJoffrey F2015-04-221-7/+22
| * assertRaises 2.6 compatJoffrey F2015-04-221-6/+3
| * Add tests for ulimitsJoffrey F2015-04-221-4/+34
| * Add support for ulimits in host_configJoffrey F2015-04-224-3/+57
| * BaseTestCase shims assertInJoffrey F2015-04-222-2/+14
|/
* Merge pull request #551 from docker/support_v2_private_registryJoffrey F2015-04-223-3/+7
|\
| * Modify expand_registry_url to support v2 private registries.support_v2_private_registryJoffrey F2015-04-223-3/+7
|/
* Merge branch 'ssssam-sam/import-improvements'Joffrey F2015-04-226-69/+330
|\
| * Merge branch 'sam/import-improvements' of https://github.com/ssssam/docker-py...Joffrey F2015-04-226-69/+330
| |\ |/ /
| * Add integration tests for Client.import_image() functionSam Thursfield2015-01-051-2/+160
| * docs: Add specific import_image() variantsSam Thursfield2015-01-051-0/+42
| * Rewrite Client.import_image() and add less-magical versionsSam Thursfield2015-01-052-27/+80
| * docs: Clarify import_image() docsSam Thursfield2015-01-051-7/+11
| * Rework Unix connection code so that 'chunked' transfers workSam Thursfield2015-01-054-31/+34
* | Merge branch 'hibooboo2-pull_auth'Joffrey F2015-04-222-10/+17
|\ \
| * | Small docs clarificationJoffrey F2015-04-221-0/+1
| * | Merge branch 'pull_auth' of https://github.com/hibooboo2/docker-py into hiboo...Joffrey F2015-04-222-10/+16
| |\ \ |/ / /
| * | Add auth config to pullJames Harris2015-02-182-10/+16
* | | Merge branch 'luzfcb-patch-1'Joffrey F2015-04-221-2/+5
|\ \ \
| * \ \ Merge branch 'patch-1' of https://github.com/luzfcb/docker-py into luzfcb-pat...Joffrey F2015-04-221-2/+5
| |\ \ \ |/ / / /
| * | | added URL for this project in setup configurationFábio C. Barrionuevo da Luz2015-03-311-0/+1
* | | | Merge branch 'terminalmage-version_info'Joffrey F2015-04-222-1/+2
|\ \ \ \
| * | | | Automatically generate version_info from version stringJoffrey F2015-04-221-1/+1
| * | | | Merge branch 'version_info' of https://github.com/terminalmage/docker-py into...Joffrey F2015-04-222-1/+2
| |\ \ \ \ |/ / / / /
| * | | | Add a version_info attributeErik Johnson2015-04-032-1/+2
| |/ / /
* | | | Merge pull request #530 from dlorenc/masterJoffrey F2015-04-222-2/+8
|\ \ \ \
View Lorry Controller Status