summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #612 from ibuildthecloud/fix-readonlyMaxime Petazzoni2015-05-261-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Typo in ReadonlyRootfsDarren Shepherd2015-05-251-1/+1
|/ / /
* | | Merge pull request #562 from smothiki/memsJoffrey F2015-05-202-1/+10
|\ \ \ | |_|/ |/| |
| * | make memory units compatible with native docker clismothiki2015-05-072-1/+10
| | * Changelog WIP1.2.3-rc0Joffrey F2015-05-261-0/+6
| | * Bumped version (rc)Joffrey F2015-05-261-2/+2
| |/ |/|
* | Merge branch 'tonicbupt-privilege'Joffrey F2015-05-201-2/+7
|\ \
| * | Only allow privileged exec_create for API version >= 1.19Joffrey F2015-05-201-2/+6
| * | Merge branch 'privilege' of https://github.com/tonicbupt/docker-py into tonic...Joffrey F2015-05-201-2/+3
| |\ \ |/ / /
| * | add privilege for exec_createtonic2015-05-081-2/+3
* | | Merge branch 'posita-raise-on-inspect-empty-string-602'Joffrey F2015-05-203-5/+26
|\ \ \
| * | | Separate check_resource inspect testsJoffrey F2015-05-201-13/+20
| * | | Fixed check_resource decoratorJoffrey F2015-05-201-5/+3
| * | | Merge branch 'raise-on-inspect-empty-string-602' of https://github.com/posita...Joffrey F2015-05-203-0/+16
| |\ \ \ |/ / / /
| * | | Fix #602. Raise ValueError on empty argument to inspect_{container,image}() m...Matt Bogosian2015-05-173-0/+16
* | | | Merge pull request #606 from bo0ts/patch-1Joffrey F2015-05-201-2/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Remove non-existing argumentPhilipp Moeller2015-05-201-2/+1
|/ / /
* | | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-05-139-614/+236
|\ \ \
| * \ \ Merge pull request #598 from HackToday/fixparameterJoffrey F2015-05-121-1/+1
| |\ \ \
| | * | | Fix the parameter mismatchHackToday2015-05-121-1/+1
| |/ / /
| * | | Fix typo in deprecated insert method. Fixes #595Maxime Petazzoni2015-05-111-1/+1
| * | | Merge pull request #593 from docker/deprecate_start_hostconfigJoffrey F2015-05-088-612/+232
| |\ \ \
| | * | | Removed instances of using host_config in start from docs and examplesdeprecate_start_hostconfigJoffrey F2015-05-085-111/+40
| | * | | Added deprecation warning for host config in startJoffrey F2015-05-083-501/+192
| | | |/ | | |/|
| * | | Merge pull request #592 from docker/cpusetcpusJoffrey F2015-05-082-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | unit testcpusetcpusJoffrey F2015-05-081-0/+1
| | * | Set 'CpusetCpus' with the value of the cpuset param in create_containerJoffrey F2015-05-081-0/+1
| |/ /
* | | Merge branch 'proppy-add-maintainer-file'Joffrey F2015-05-131-0/+3
|\ \ \ | |/ / |/| |
| * | Added Maxime to maintainersJoffrey F2015-05-131-0/+2
| * | Merge branch 'add-maintainer-file' of https://github.com/proppy/docker-py int...Joffrey F2015-05-131-0/+1
| |\ \ |/ / /
| * | add MAINTAINERSJohan Euphrosine2015-04-211-0/+1
* | | Merge pull request #590 from docker/events_decode_docJoffrey F2015-05-071-3/+4
|\ \ \
| * | | Added documentation for decode param on stats and eventsevents_decode_docJoffrey F2015-05-071-3/+4
|/ / /
* | | Merge pull request #587 from docker/fix-586Joffrey F2015-05-063-3/+6
|\ \ \ | |_|/ |/| |
| * | dev versionfix-586Joffrey F2015-05-061-1/+1
| * | 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
|/ /