summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release'update_master_release_notesJoffrey F2019-05-013-0/+15
|\
| * Merge pull request #2299 from ulyssessouza/3.7.2-release3.7.2Ulysses Souza2019-03-286-16/+27
| |\
| | * Bump 3.7.2Ulysses Souza2019-03-282-1/+12
| | * scripts/version.py: Use regex grouping to extract the versionIan Campbell2019-03-281-7/+3
| | * Fix base_url to keep TCP protocolUlysses Souza2019-03-282-7/+9
| | * Xfail test_attach_stream_and_cancel on TLSUlysses Souza2019-03-281-1/+3
| |/
* | Merge pull request #2328 from docker/modernize_test_depsJoffrey F2019-05-014-29/+26
|\ \
| * | Update some test dependencies / default values with newer versionsJoffrey F2019-05-014-29/+26
* | | Merge pull request #2296 from hannseman/swarm-init-responseJoffrey F2019-05-013-7/+8
|\ \ \
| * | | Return node id on swarm initHannes Ljungberg2019-05-013-7/+8
* | | | Merge pull request #2303 from hannseman/swarm-DataPathAddrJoffrey F2019-05-014-8/+50
|\ \ \ \
| * | | | Add test for join on already joined swarmHannes Ljungberg2019-05-011-0/+12
| * | | | Add swarm support for data_addr_pathHannes Ljungberg2019-05-013-8/+38
| |/ / /
* | | | Merge pull request #2222 from docker/vendor_dockerpycredsJoffrey F2019-05-0119-15/+343
|\ \ \ \ | |_|/ / |/| | |
| * | | New Jenkinsfile build instructionsvendor_dockerpycredsJoffrey F2019-04-301-2/+2
| * | | Make dockerpycreds part of the SDK under docker.credentialsJoffrey F2019-04-3018-13/+341
* | | | Merge pull request #2327 from docker/demux_test_fixesJoffrey F2019-05-012-8/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve low_timeout test resilienceJoffrey F2019-05-011-4/+4
| * | | Streaming TTY messages sometimes get truncated. Handle gracefully in demux testsdemux_test_fixesJoffrey F2019-05-011-4/+12
|/ / /
* | | Merge pull request #2317 from docker/fix_socket_detach_helperJoffrey F2019-05-012-8/+13
|\ \ \
| * | | Increase timeout on test with long sleepsfix_socket_detach_helperJoffrey F2019-05-011-1/+1
| * | | Reorder importsJoffrey F2019-05-011-3/+3
| * | | Improve socket_detached test helper to support future versions of the daemonJoffrey F2019-05-011-4/+9
|/ / /
* | | Merge pull request #2326 from docker/fix_exec_demux_testsJoffrey F2019-05-011-72/+80
|\ \ \
| * | | Separate into individual testsfix_exec_demux_testsJoffrey F2019-05-011-63/+77
| * | | Avoid demux test flakinessJoffrey F2019-04-301-27/+21
|/ / /
* | | Merge pull request #2309 from thaJeztah/remove_init_path_createJoffrey F2019-04-302-14/+0
|\ \ \ | |/ / |/| |
| * | Remove init_path from createSebastiaan van Stijn2019-04-102-14/+0
* | | Merge pull request #2325 from docker/fix_versions_scriptJoffrey F2019-04-301-3/+3
|\ \ \
| * | | Fix versions.py to include release stagefix_versions_scriptJoffrey F2019-04-301-3/+3
|/ / /
* | | Merge pull request #2322 from adamtheturtle/fix-rendered-exit-code-exec-runJoffrey F2019-04-271-1/+1
|\ \ \
| * | | Replace triple backtick in exec_run documentation which caused a rendering er...Adam Dangoor2019-04-271-1/+1
|/ / /
* | | Merge pull request #2297 from hannseman/service-initJoffrey F2019-04-144-1/+27
|\ \ \ | |/ / |/| |
| * | Add support for setting init on servicesHannes Ljungberg2019-03-284-1/+27
* | | Merge pull request #2304 from hannseman/swarm-join-listen_addrChris Crone2019-04-041-1/+1
|\ \ \
| * | | Document correct listen_addr on join swarmHannes Ljungberg2019-03-311-1/+1
| |/ /
* | | Merge pull request #2307 from ulyssessouza/xfail-flaky-testUlysses Souza2019-04-041-5/+2
|\ \ \
| * | | Add 'sleep 2' to avoid race condition on attachUlysses Souza2019-04-041-5/+2
|/ / /
* | | Merge pull request #1882 from larkost/1743-container-portsUlysses Souza2019-04-032-0/+67
|\ \ \ | |/ / |/| |
| * | Refactor and add testsUlysses Souza2019-03-261-8/+46
| * | add ports to containersKarl Kuehn2019-03-262-0/+29
* | | Merge pull request #2298 from ijc/fix-docker-version-detection-scriptUlysses Souza2019-03-281-7/+3
|\ \ \
| * | | scripts/version.py: Use regex grouping to extract the versionIan Campbell2019-03-281-7/+3
|/ / /
* | | Merge pull request #2292 from ulyssessouza/fix-config-proxy-mappingUlysses Souza2019-03-273-8/+12
|\ \ \ | |/ / |/| |
| * | Fix base_url to keep TCP protocolUlysses Souza2019-03-262-7/+9
| * | Xfail test_attach_stream_and_cancel on TLSUlysses Souza2019-03-261-1/+3
|/ /
* | Merge pull request #2227 from docker/2225-inspect_distrib_authIan Campbell2019-03-262-16/+32
|\ \
| * | Add registry auth header to inspect_distribution requests2225-inspect_distrib_authJoffrey F2019-01-112-16/+32
* | | Merge pull request #2288 from hannseman/container-run-create-volume_driverIan Campbell2019-03-253-2/+12
|\ \ \
| * | | Move volume_driver to RUN_HOST_CONFIG_KWARGSHannes Ljungberg2019-03-233-2/+12