summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add support for isolation param in host confighost_config_isolationJoffrey F2016-09-294-2/+33
* Merge pull request #1224 from mferon/addRestartPolicyUpdateSupportJoffrey F2016-09-293-1/+40
|\
| * Add support for restart policy updateMaxime Feron2016-09-283-1/+40
* | Merge pull request #1232 from pacoxu/typo_pacoJoffrey F2016-09-291-1/+1
|\ \
| * | replace on_failure with on-failure徐俊杰2016-09-291-1/+1
| |/
* | Merge pull request #1234 from aboch/ipJoffrey F2016-09-291-5/+4
|\ \ | |/ |/|
| * Adjust test_create_network_with_ipam_configAlessandro Boch2016-09-291-5/+4
|/
* Merge pull request #1228 from christianbundy/synthesize-execute-bitJoffrey F2016-09-271-1/+16
|\
| * Pass file object to Tarfile.addfile()Christian Bundy2016-09-271-1/+12
| * Synthesize executable bit on WindowsSebastian Schwarz2016-09-271-1/+5
|/
* Merge branch 'release'Joffrey F2016-09-194-3/+42
|\
| * Merge pull request #1220 from docker/1.10.3-release1.10.3Joffrey F2016-09-168-18/+86
| |\
| | * Number of pools in adapter is configurable1.10.3-releaseJoffrey F2016-09-164-15/+31
| | * Add support for identity tokens in config file.Joffrey F2016-09-162-2/+37
| | * Bump versionJoffrey F2016-09-162-1/+18
| |/
| * Merge pull request #1202 from docker/1.10.2-release1.10.2Joffrey F2016-09-114-3/+14
| |\
| | * Bump docker-pycreds dependency ; bump patch numberJoffrey F2016-09-114-3/+14
| |/
| * Merge pull request #1198 from docker/1.10.1-release1.10.1Joffrey F2016-09-094-2/+20
| |\
| | * Re-add docker.utils.types module for backwards compatibility1.10.1-releaseJoffrey F2016-09-091-0/+7
| | * Bump version + Update ChangelogJoffrey F2016-09-093-2/+13
| |/
* | Merge pull request #1210 from docker/identity-token-supportJoffrey F2016-09-162-2/+37
|\ \
| * | Add support for identity tokens in config file.identity-token-supportJoffrey F2016-09-152-2/+37
* | | Merge pull request #1215 from bfirsh/autopep8Joffrey F2016-09-1411-12/+17
|\ \ \
| * | | Fix a few pep8 issuesBen Firshman2016-09-1411-12/+17
* | | | Merge pull request #1216 from bfirsh/makefile-improvementsJoffrey F2016-09-141-2/+6
|\ \ \ \
| * | | | Add make shell to open a Python shellBen Firshman2016-09-141-0/+4
| * | | | Add file arg to integration testsBen Firshman2016-09-141-2/+2
| |/ / /
* | | | Merge pull request #1208 from docker/1207-configurable-num-poolsJoffrey F2016-09-144-15/+31
|\ \ \ \ | | |/ / | |/| |
| * | | Number of pools in adapter is configurable1207-configurable-num-poolsJoffrey F2016-09-124-15/+31
* | | | Merge pull request #1213 from bfirsh/parse-json-errorsJoffrey F2016-09-143-3/+23
|\ \ \ \
| * | | | Parse JSON API errorsBen Firshman2016-09-143-3/+23
| | |/ / | |/| |
* | | | Merge pull request #1214 from bfirsh/ignore-not-in-swarm-error-when-leavingJoffrey F2016-09-143-17/+10
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| |\
View Lorry Controller Status