summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* dev versionresync-releaseJoffrey F2019-05-181-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Changelog 4.0.1Joffrey F2019-05-181-0/+14
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Bump 4.0.1Joffrey F2019-05-181-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #2347 from docker/resync-releaseJoffrey F2019-05-183-1/+52
|\ | | | | Resync release branch with master
| * Version bumpJoffrey F2019-05-181-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Update changelog for 4.0.0Joffrey F2019-05-181-0/+37
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Bump version 4.0.0Joffrey F2019-05-181-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Bump 3.7.2Ulysses Souza2019-05-181-0/+11
| | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * Xfail test_attach_stream_and_cancel on TLSUlysses Souza2019-05-181-0/+3
| | | | | | | | | | | | This test is quite flaky on ssl integration test Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #2335 from isidentical/masterJoffrey F2019-05-181-2/+2
|\ \ | | | | | | reference swarm page correctly
| * | reference swarm page correctlyBatuhan Taşkaya2019-05-091-2/+2
| | | | | | | | | | | | Signed-off-by: Batuhan Taşkaya <btaskaya33@gmail.com>
* | | Merge pull request #2346 from itssimon/masterJoffrey F2019-05-181-3/+3
|\ \ \ | | | | | | | | Change os.errno to errno for py3.7 compatibility
| * | | Change os.errno to errno for py3.7 compatibilitySimon Gurcke2019-05-191-3/+3
| | |/ | |/| | | | | | | Signed-off-by: Simon Gurcke <simon@gurcke.de>
* | | Merge pull request #2343 from docker/rtd-confJoffrey F2019-05-181-0/+10
|\ \ \ | |/ / |/| | Add readthedocs config
| * | Add readthedocs configrtd-confJoffrey F2019-05-181-0/+10
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2339 from ulyssessouza/bump-urllib3Joffrey F2019-05-151-1/+1
|\ \ | |/ |/| Bump urllib3 -> 1.24.3
| * Bump urllib3 -> 1.24.3Ulysses Souza2019-05-151-1/+1
|/ | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* Merge pull request #2329 from docker/end_3.4_supportJoffrey F2019-05-055-9/+5
|\ | | | | End Python 3.4 support
| * Stop supporting EOL Python 3.4end_3.4_supportJoffrey F2019-05-014-8/+5
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * Remove obsolete win32-requirements fileJoffrey F2019-05-011-1/+0
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2332 from docker/use_proxy_config_defaultJoffrey F2019-05-024-15/+17
|\ \ | | | | | | Change use_config_proxy default value to True to match CLI behavior
| * | Don't add superfluous argumentsuse_proxy_config_defaultJoffrey F2019-05-021-1/+1
| | | | | | | | | | | | Signed-off-by: Joffrey F <f.joffrey@gmail.com>
| * | Change use_config_proxy default value to True to match CLI behaviorJoffrey F2019-05-014-14/+16
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2295 from hannseman/swarm-rotate-tokenJoffrey F2019-05-013-8/+35
|\ \ | |/ |/| Add support for rotate_manager_unlock_key
| * Add support for rotate_manager_unlock_keyHannes Ljungberg2019-05-013-8/+35
| | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* | Merge pull request #2328 from docker/modernize_test_depsJoffrey F2019-05-014-29/+26
|\ \ | |/ |/| Update some test dependencies / default values with newer versions
| * Update some test dependencies / default values with newer versionsJoffrey F2019-05-014-29/+26
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2296 from hannseman/swarm-init-responseJoffrey F2019-05-013-7/+8
|\ \ | | | | | | Return node id on swarm init
| * | Return node id on swarm initHannes Ljungberg2019-05-013-7/+8
| | | | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* | | Merge pull request #2303 from hannseman/swarm-DataPathAddrJoffrey F2019-05-014-8/+50
|\ \ \ | | | | | | | | Add support for swarm DataPathAddr
| * | | Add test for join on already joined swarmHannes Ljungberg2019-05-011-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
| * | | Add swarm support for data_addr_pathHannes Ljungberg2019-05-013-8/+38
| |/ / | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
* | | Merge pull request #2222 from docker/vendor_dockerpycredsJoffrey F2019-05-0119-15/+343
|\ \ \ | |_|/ |/| | Make dockerpycreds part of the SDK under docker.credentials
| * | New Jenkinsfile build instructionsvendor_dockerpycredsJoffrey F2019-04-301-2/+2
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Make dockerpycreds part of the SDK under docker.credentialsJoffrey F2019-04-3018-13/+341
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | | Merge pull request #2327 from docker/demux_test_fixesJoffrey F2019-05-012-8/+16
|\ \ \ | |_|/ |/| | Streaming TTY messages sometimes get truncated
| * | Improve low_timeout test resilienceJoffrey F2019-05-011-4/+4
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Streaming TTY messages sometimes get truncated. Handle gracefully in demux testsdemux_test_fixesJoffrey F2019-05-011-4/+12
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2317 from docker/fix_socket_detach_helperJoffrey F2019-05-012-8/+13
|\ \ | | | | | | Fix socket detach helper
| * | Increase timeout on test with long sleepsfix_socket_detach_helperJoffrey F2019-05-011-1/+1
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Reorder importsJoffrey F2019-05-011-3/+3
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Improve socket_detached test helper to support future versions of the daemonJoffrey F2019-05-011-4/+9
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2326 from docker/fix_exec_demux_testsJoffrey F2019-05-011-72/+80
|\ \ | | | | | | Avoid demux test flakiness
| * | Separate into individual testsfix_exec_demux_testsJoffrey F2019-05-011-63/+77
| | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
| * | Avoid demux test flakinessJoffrey F2019-04-301-27/+21
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #2309 from thaJeztah/remove_init_path_createJoffrey F2019-04-302-14/+0
|\ \ | |/ |/| Remove init_path from create
| * Remove init_path from createSebastiaan van Stijn2019-04-102-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | This option was never functional, and was not intended to be added to the "container create" API, so let's remove it, because it has been removed in Docker 17.05, and was broken in versions before that; see - https://github.com/moby/moby/issues/32355 --init-path does not seem to work - https://github.com/moby/moby/pull/32470 remove --init-path from client Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | Merge pull request #2325 from docker/fix_versions_scriptJoffrey F2019-04-301-3/+3
|\ \ | | | | | | Fix versions.py to include release stage
| * | Fix versions.py to include release stagefix_versions_scriptJoffrey F2019-04-301-3/+3
|/ / | | | | | | Signed-off-by: Joffrey F <f.joffrey@gmail.com>
* | 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 rend…