summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Support version parameter in `Client.from_env`1075-from-env-versionJoffrey F2016-08-252-1/+10
* Merge branch 'DaoCloud-feature/memory_support'Joffrey F2016-08-232-2/+30
|\
| * support MemoryReservation and KernelMemoryKay Yan2016-08-232-2/+30
|/
* Merge branch 'srikalyan-master'Joffrey F2016-08-233-3/+22
|\
| * Merge branch 'master' of https://github.com/srikalyan/docker-py into srikalya...Joffrey F2016-08-233-3/+22
| |\ |/ /
| * Added support for user namespace.Srikalyan Swayampakula2016-06-303-2/+21
* | Merge branch 'joshpurvis-jp-cpushares'Joffrey F2016-08-235-4/+111
|\ \
| * \ Merge branch 'jp-cpushares' of https://github.com/joshpurvis/docker-py into j...Joffrey F2016-08-235-4/+111
| |\ \ |/ / /
| * | Move cpu_shares and cpuset_cpu to HostConfig when API >= 1.18Josh Purvis2016-08-155-4/+110
* | | Merge pull request #1081 from tescalada/masterJoffrey F2016-08-231-2/+10
|\ \ \
| * | | 1059-Fixing a bug with multiple json objectsTristan Escalada2016-08-011-2/+10
* | | | Merge pull request #1131 from Knetic/dnsoptsJoffrey F2016-08-233-1/+21
|\ \ \ \
| * | | | Implemented dns_opt support (from api 1.21)George Lester2016-08-073-1/+21
* | | | | Merge pull request #1127 from docker/1085-service-supportJoffrey F2016-08-2322-49/+1380
|\ \ \ \ \
| * | | | | Private images support in create_service / update_service1085-service-supportJoffrey F2016-08-236-38/+91
| * | | | | Add services documentationJoffrey F2016-08-222-2/+163
| * | | | | Rename LogDriver to DriverConfig for genericityJoffrey F2016-08-222-2/+2
| * | | | | Add new pages to mkdocs indexJoffrey F2016-08-191-0/+2
| * | | | | Services API documentation (WIP)Joffrey F2016-08-192-0/+118
| * | | | | New docker.types subpackage containing advanced config dictionary typesJoffrey F2016-08-1912-242/+345
| * | | | | Service API integration testsJoffrey F2016-08-172-2/+105
| * | | | | Swarm service API implementationJoffrey F2016-08-174-4/+241
| * | | | | Remove references to "ExecutionDriver"Brian Goff2016-08-173-39/+2
| * | | | | docker client consistency: don't quote ':/'Tomas Tomecek2016-08-172-3/+11
| * | | | | Exclude requests 2.11 from setup.py to work around unicode bugJoffrey F2016-08-171-1/+1
| * | | | | Add `nodes` and `inspect_node` methodsswarm-supportJoffrey F2016-08-114-1/+104
| * | | | | Reference swarm methods in api.md file.Joffrey F2016-08-041-0/+25
| * | | | | Add support for custom name in SwarmSpecJoffrey F2016-08-043-1/+26
| * | | | | Update Swarm API docsJoffrey F2016-08-041-9/+131
| * | | | | Update arguments for several Swarm API methodsJoffrey F2016-08-044-20/+52
| * | | | | Update Swarm documentationJoffrey F2016-08-031-22/+61
| * | | | | Add new init_swarm test with custom specJoffrey F2016-08-032-3/+15
| * | | | | Update swarm methods to include newly added parametersJoffrey F2016-08-035-18/+136
| * | | | | Added support for docker swarm api version 1.24.minzhang2016-08-031-1/+1
| * | | | | Added support for docker swarm api version 1.24.minzhang2016-08-034-1/+79
| |/ / / /
* | | | | Merge pull request #1162 from cpuguy83/remove_execdriver_refsJoffrey F2016-08-163-39/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove references to "ExecutionDriver"Brian Goff2016-08-163-39/+2
|/ / / /
* | | | Merge pull request #1142 from TomasTomecek/dont-url-encode-repository-nameDaniel Nephin2016-08-102-3/+11
|\ \ \ \
| * | | | docker client consistency: don't quote ':/'Tomas Tomecek2016-08-102-3/+11
|/ / / /
* | | | Merge pull request #1156 from docker/1155-requests-bugJoffrey F2016-08-091-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Exclude requests 2.11 from setup.py to work around unicode bug1155-requests-bugJoffrey F2016-08-091-1/+1
|/ / /
* | | Merge pull request #1151 from docker/test_fixes_1.12Joffrey F2016-08-033-13/+25
|\ \ \
| * | | Test fixes and updated Makefile for 1.12 testingtest_fixes_1.12Joffrey F2016-08-033-13/+25
|/ / /
* | | Merge pull request #1150 from docker/1148-update-headers-fixDaniel Nephin2016-08-022-2/+35
|\ \ \
| * | | Avoid crashing in update_headers decorator when headers kwarg is None1148-update-headers-fixJoffrey F2016-08-022-2/+35
|/ / /
* | | Merge pull request #1145 from jtakkala/1144-sysctl-supportJoffrey F2016-08-013-1/+36
|\ \ \
| * | | Add support for sysctl when creating containerJari Takkala2016-08-013-1/+36
|/ / /
* | | Merge pull request #1146 from aanand/config-path-debugJoffrey F2016-08-011-4/+9
|\ \ \ | |/ / |/| |
| * | More explicit debug for config path logicAanand Prasad2016-08-011-4/+9
|/ /
* | Merge pull request #1143 from docker/1135-ipv6-docker-hostJoffrey F2016-07-282-21/+27
|\ \