summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove trailing slashes in result of utils.parse_hostbase_url_trailing_slashJoffrey F2016-10-122-2/+7
* Merge pull request #1248 from docker/setup-py-fixesJoffrey F2016-10-051-0/+12
|\
| * Add missing long_description and maintainer fields to setup.pysetup-py-fixesJoffrey F2016-10-051-0/+12
|/
* Merge pull request #1243 from mattjegan/masterJoffrey F2016-10-051-1/+1
|\
| * Fix syntax in README required by RSTmattjegan2016-10-041-1/+1
* | Merge pull request #1226 from TomasTomecek/remove-ipaddress-depJoffrey F2016-10-051-0/+3
|\ \
| * | document requirement for ipaddress moduleTomas Tomecek2016-10-051-0/+3
* | | Merge branch 'api-docs-update'Joffrey F2016-10-051-27/+23
|\ \ \
| * \ \ Merge branch 'TomasTomecek-improve-version-mismatcj'Joffrey F2016-10-051-0/+24
| |\ \ \ | | |/ / | |/| |
* | | | Merge branch 'TomasTomecek-improve-version-mismatcj'Joffrey F2016-10-051-0/+28
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Removed non-existent FAQ page from mkdocs.ymlJoffrey F2016-10-051-1/+0
| * | document how to recover from api version mismatchTomas Tomecek2016-10-052-0/+29
|/ /
* | Update adapters to use pool_connections instead of num_poolsJoffrey F2016-10-043-6/+6
* | fix for got an unexpected keyword argument 'num_pools'Pierre Tardy2016-10-041-1/+1
|/
* Merge pull request #1217 from bfirsh/reorganisation-base-testsJoffrey F2016-10-0319-203/+182
|\
| * Move requires_api_version to helpersBen Firshman2016-10-0311-37/+35
| * Move BaseTestCase to BaseIntegrationTestBen Firshman2016-10-0314-168/+147
| * Add timeout to from_envBen Firshman2016-10-031-1/+3
|/
* 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
|/ / /
View Lorry Controller Status