summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Ignore not in swarm error when force leavingBen Firshman2016-09-143-17/+10
|/ / /
* | | Merge pull request #1197 from docker/1196-docker.utils.typesJoffrey F2016-09-091-0/+7
|\ \ \ | |/ / |/| |
| * | Re-add docker.utils.types module for backwards compatibility1196-docker.utils.typesJoffrey F2016-09-091-0/+7
|/ /
* | dev versionJoffrey F2016-09-091-1/+1
|/
* Merge pull request #1190 from docker/1.10.0-release1.10.0Joffrey F2016-09-0957-478/+2520
|\
| * Bump version1.10.0-releaseJoffrey F2016-09-083-2/+47
| * Merge pull request #1087 from docker/1076-dns-fixJoffrey F2016-09-081-0/+5
| |\
| | * Remove default adapters when connecting through a unix socket.1076-dns-fixJoffrey F2016-09-081-0/+5
| |/
| * Merge pull request #1191 from bfirsh/fix-makefile-phonyJoffrey F2016-09-081-2/+15
| |\
| | * Add .PHONY for each makefile instructionBen Firshman2016-09-081-2/+15
| |/
| * Merge pull request #1189 from docker/1188-npipesocket-makefileJoffrey F2016-09-071-1/+1
| |\
| | * Handle bufsize < 0 in makefile() as a substitute for default1188-npipesocket-makefileJoffrey F2016-09-071-1/+1
| |/
| * Merge pull request #1187 from bfirsh/fix-broken-mac-address-unit-testJoffrey F2016-09-072-37/+10
| |\
| | * Fix unit test which doesn't do anythingBen Firshman2016-09-072-37/+10
| |/
| * Merge pull request #1092 from docker/1064-import-changesJoffrey F2016-09-063-78/+141
| |\
| | * Add test for import_image with changes param1064-import-changesJoffrey F2016-09-062-3/+44
| | * Add support for changes param in import_image* methodsJoffrey F2016-09-061-75/+97
| |/
| * Merge pull request #1181 from docker/credstore-supportJoffrey F2016-09-063-1/+41
| |\
| | * Better credentials store error handling in resolve_authconfigcredstore-supportJoffrey F2016-09-063-7/+8
| | * Add credentials store supportJoffrey F2016-09-063-1/+40
| |/
| * Merge pull request #1184 from bfirsh/fix-licensesJoffrey F2016-09-069-122/+1
| |\
| | * Fix licensesBen Firshman2016-09-059-122/+1
| * | Merge pull request #1185 from bfirsh/make-docsJoffrey F2016-09-063-1/+16
| |\ \ | | |/ | |/|
| | * Add make docs command for building docsBen Firshman2016-09-053-1/+16
| |/
| * Merge pull request #1180 from kanaka/patch-1Joffrey F2016-09-021-1/+1
| |\
| | * Fix Mount bind type sanity checkJoel Martin2016-09-021-1/+1
| |/
| * Merge pull request #1178 from docker/1105-network-apiJoffrey F2016-09-014-12/+94
| |\
| | * Add support for force disconnect1105-network-apiJoffrey F2016-08-314-4/+41
| | * Add support for labels and enable_ipv6 in create_networkJoffrey F2016-08-313-8/+53
| |/
| * Merge pull request #1167 from docker/1075-from-env-versionJoffrey F2016-08-252-1/+10
| |\
| | * Support version parameter in `Client.from_env`1075-from-env-versionJoffrey F2016-08-252-1/+10
| * | Merge pull request #1168 from docker/aiden0z-masterJoffrey F2016-08-253-4/+22
| |\ \
| | * | Docs and tests for pids_limit.aiden0z-masterJoffrey F2016-08-232-3/+14
| | * | Merge branch 'master' of https://github.com/aiden0z/docker-py into aiden0z-ma...Joffrey F2016-08-231-1/+8
| | |\ \ | | | |/ | | |/|
| | | * fix #1094, support PidsLimit in host configAiden Luo2016-06-171-1/+8
| * | | Merge pull request #1172 from fermayo/fix-utf8-envvarsJoffrey F2016-08-252-1/+21
| |\ \ \
| | * | | Fix creating containers with env vars with unicode charactersfermayo2016-08-252-1/+21
| |/ / /
| * | | Merge pull request #1082 from masci/fix_stream_helperJoffrey F2016-08-232-2/+42
| |\ \ \ | | |/ / | |/| |
| | * | invoke self._result with json=True if decode=TrueMassimiliano Pippi2016-06-072-2/+42
| * | | 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
| |\ \ \ \ \ \
View Lorry Controller Status