summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | Fixes for #586Joffrey F2015-05-062-2/+5
|/ /
* | Merge pull request #582 from docker/1.2.2-release1.2.2Joffrey F2015-05-043-2/+11
|\ \
| * | Updated changelog1.2.2-releaseJoffrey F2015-05-041-0/+8
| * | Bumped versionJoffrey F2015-05-042-2/+3
|/ /
* | Merge pull request #576 from ctrlhxj/fix_exec_resizeJoffrey F2015-04-302-24/+9
|\ \
| * | exec_resize is incorrectly passing param as jsonXiaojian Huang2015-04-282-24/+9
* | | Merge pull request #577 from pmoosh/masterJoffrey F2015-04-301-1/+1
|\ \ \
| * | | Update client.pyPeter Mooshammer2015-04-291-1/+1
| |/ /
* | | back to dev versionJoffrey F2015-04-301-1/+1
|/ /
* | Merge pull request #575 from docker/1.2.1-release1.2.1Joffrey F2015-04-284-9/+26
|\ \
| * | Bumped version, changelog1.2.1-releaseJoffrey F2015-04-282-1/+9
| * | Fix #573Joffrey F2015-04-282-8/+17
|/ /
* | Merge pull request #572 from dlorenc/masterJoffrey F2015-04-281-2/+2
|\ \
| * | Change decorators to use a relative import.dlorenc2015-04-271-2/+2
* | | Back to dev versionJoffrey F2015-04-281-1/+1
|/ /
* | Merge pull request #571 from docker/1.2.0-release1.2.0Joffrey F2015-04-273-2/+48
|\ \
| * | Added 'label' to list of filters1.2.0-releaseJoffrey F2015-04-271-1/+2
| * | Updated ChangeLogJoffrey F2015-04-271-0/+45
| * | Bumped versionJoffrey F2015-04-271-1/+1
|/ /
* | Merge pull request #570 from docker/build_limitsJoffrey F2015-04-274-80/+118
|\ \
| * | 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 #569 from docker/docs_filtersJoffrey F2015-04-271-2/+7
|\ \ \ | |/ / |/| |
| * | Improved filters documentationdocs_filtersJoffrey F2015-04-271-2/+7
|/ /
* | 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