summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix endpoint spec and networks params in update_service1212-fix_create_serviceJoffrey F2016-11-042-5/+14
* WIPJoffrey F2016-11-047-6/+143
* Merge pull request #1285 from docker/1284-settimeout-fixJoffrey F2016-11-021-3/+6
|\
| * Fix NpipeSocket.settimeout to match expected behavior1284-settimeout-fixJoffrey F2016-11-021-3/+6
|/
* Merge pull request #1283 from aboch/ipJoffrey F2016-11-021-13/+4
|\
| * Changes for service tests to pass in docker masterAlessandro Boch2016-11-011-13/+4
|/
* Merge pull request #1274 from docker/npipe-socket-busy-retryAanand Prasad2016-10-271-10/+24
|\
| * Implement retry logic when the npipe open procedure failsnpipe-socket-busy-retryJoffrey F2016-10-261-10/+24
|/
* Merge pull request #1258 from docker/win32-test-fixesJoffrey F2016-10-1410-104/+149
|\
| * Fix dockerignore exclusion logic on Windowswin32-test-fixesJoffrey F2016-10-142-2/+8
| * Update tests to avoid failures on Windows platformsJoffrey F2016-10-149-102/+141
* | Merge pull request #1242 from YorikSar/masterJoffrey F2016-10-142-3/+3
|\ \ | |/ |/|
| * Support requests versions from 2.11.1 onwardsYuriy Taraday2016-10-032-3/+3
* | Merge pull request #1254 from docker/npipe-advancedJoffrey F2016-10-145-4/+45
|\ \
| * | Several fixes to npipe supportnpipe-advancedJoffrey F2016-10-125-3/+44
| * | Do not allow bufsize to be 0 in NpipeSocket.makefile()1251-strictly-positive-bufsizeJoffrey F2016-10-111-1/+1
* | | Merge pull request #1256 from docker/format_env_unicode_bugJoffrey F2016-10-132-2/+20
|\ \ \
| * | | Do not break when calling format_environment with unicode valuesformat_env_unicode_bugJoffrey F2016-10-122-2/+20
| |/ /
* | | Merge pull request #1255 from docker/base_url_trailing_slashJoffrey F2016-10-132-2/+7
|\ \ \
| * | | Remove trailing slashes in result of utils.parse_hostbase_url_trailing_slashJoffrey F2016-10-122-2/+7
| |/ /
* | | Merge pull request #1257 from bfirsh/remove-dead-codeJoffrey F2016-10-131-3/+0
|\ \ \ | |/ / |/| |
| * | Remove dead code in import_image_from_dataBen Firshman2016-10-131-3/+0
|/ /
* | 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
| |\