Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dev versionresync-release | Joffrey F | 2019-05-18 | 1 | -1/+1 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Changelog 4.0.1 | Joffrey F | 2019-05-18 | 1 | -0/+14 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Bump 4.0.1 | Joffrey F | 2019-05-18 | 1 | -1/+1 |
| | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | Merge pull request #2347 from docker/resync-release | Joffrey F | 2019-05-18 | 3 | -1/+52 |
|\ | | | | | Resync release branch with master | ||||
| * | Version bump | Joffrey F | 2019-05-18 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Update changelog for 4.0.0 | Joffrey F | 2019-05-18 | 1 | -0/+37 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Bump version 4.0.0 | Joffrey F | 2019-05-18 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Bump 3.7.2 | Ulysses Souza | 2019-05-18 | 1 | -0/+11 |
| | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com> | ||||
| * | Xfail test_attach_stream_and_cancel on TLS | Ulysses Souza | 2019-05-18 | 1 | -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/master | Joffrey F | 2019-05-18 | 1 | -2/+2 |
|\ \ | | | | | | | reference swarm page correctly | ||||
| * | | reference swarm page correctly | Batuhan Taşkaya | 2019-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Batuhan Taşkaya <btaskaya33@gmail.com> | ||||
* | | | Merge pull request #2346 from itssimon/master | Joffrey F | 2019-05-18 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | Change os.errno to errno for py3.7 compatibility | ||||
| * | | | Change os.errno to errno for py3.7 compatibility | Simon Gurcke | 2019-05-19 | 1 | -3/+3 |
| | |/ | |/| | | | | | | | Signed-off-by: Simon Gurcke <simon@gurcke.de> | ||||
* | | | Merge pull request #2343 from docker/rtd-conf | Joffrey F | 2019-05-18 | 1 | -0/+10 |
|\ \ \ | |/ / |/| | | Add readthedocs config | ||||
| * | | Add readthedocs configrtd-conf | Joffrey F | 2019-05-18 | 1 | -0/+10 |
|/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge pull request #2339 from ulyssessouza/bump-urllib3 | Joffrey F | 2019-05-15 | 1 | -1/+1 |
|\ \ | |/ |/| | Bump urllib3 -> 1.24.3 | ||||
| * | Bump urllib3 -> 1.24.3 | Ulysses Souza | 2019-05-15 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com> | ||||
* | Merge pull request #2329 from docker/end_3.4_support | Joffrey F | 2019-05-05 | 5 | -9/+5 |
|\ | | | | | End Python 3.4 support | ||||
| * | Stop supporting EOL Python 3.4end_3.4_support | Joffrey F | 2019-05-01 | 4 | -8/+5 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Remove obsolete win32-requirements file | Joffrey F | 2019-05-01 | 1 | -1/+0 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge pull request #2332 from docker/use_proxy_config_default | Joffrey F | 2019-05-02 | 4 | -15/+17 |
|\ \ | | | | | | | Change use_config_proxy default value to True to match CLI behavior | ||||
| * | | Don't add superfluous argumentsuse_proxy_config_default | Joffrey F | 2019-05-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <f.joffrey@gmail.com> | ||||
| * | | Change use_config_proxy default value to True to match CLI behavior | Joffrey F | 2019-05-01 | 4 | -14/+16 |
|/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge pull request #2295 from hannseman/swarm-rotate-token | Joffrey F | 2019-05-01 | 3 | -8/+35 |
|\ \ | |/ |/| | Add support for rotate_manager_unlock_key | ||||
| * | Add support for rotate_manager_unlock_key | Hannes Ljungberg | 2019-05-01 | 3 | -8/+35 |
| | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se> | ||||
* | | Merge pull request #2328 from docker/modernize_test_deps | Joffrey F | 2019-05-01 | 4 | -29/+26 |
|\ \ | |/ |/| | Update some test dependencies / default values with newer versions | ||||
| * | Update some test dependencies / default values with newer versions | Joffrey F | 2019-05-01 | 4 | -29/+26 |
| | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge pull request #2296 from hannseman/swarm-init-response | Joffrey F | 2019-05-01 | 3 | -7/+8 |
|\ \ | | | | | | | Return node id on swarm init | ||||
| * | | Return node id on swarm init | Hannes Ljungberg | 2019-05-01 | 3 | -7/+8 |
| | | | | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se> | ||||
* | | | Merge pull request #2303 from hannseman/swarm-DataPathAddr | Joffrey F | 2019-05-01 | 4 | -8/+50 |
|\ \ \ | | | | | | | | | Add support for swarm DataPathAddr | ||||
| * | | | Add test for join on already joined swarm | Hannes Ljungberg | 2019-05-01 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se> | ||||
| * | | | Add swarm support for data_addr_path | Hannes Ljungberg | 2019-05-01 | 3 | -8/+38 |
| |/ / | | | | | | | | | | Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se> | ||||
* | | | Merge pull request #2222 from docker/vendor_dockerpycreds | Joffrey F | 2019-05-01 | 19 | -15/+343 |
|\ \ \ | |_|/ |/| | | Make dockerpycreds part of the SDK under docker.credentials | ||||
| * | | New Jenkinsfile build instructionsvendor_dockerpycreds | Joffrey F | 2019-04-30 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Make dockerpycreds part of the SDK under docker.credentials | Joffrey F | 2019-04-30 | 18 | -13/+341 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | | Merge pull request #2327 from docker/demux_test_fixes | Joffrey F | 2019-05-01 | 2 | -8/+16 |
|\ \ \ | |_|/ |/| | | Streaming TTY messages sometimes get truncated | ||||
| * | | Improve low_timeout test resilience | Joffrey F | 2019-05-01 | 1 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Streaming TTY messages sometimes get truncated. Handle gracefully in demux testsdemux_test_fixes | Joffrey F | 2019-05-01 | 1 | -4/+12 |
|/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge pull request #2317 from docker/fix_socket_detach_helper | Joffrey F | 2019-05-01 | 2 | -8/+13 |
|\ \ | | | | | | | Fix socket detach helper | ||||
| * | | Increase timeout on test with long sleepsfix_socket_detach_helper | Joffrey F | 2019-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Reorder imports | Joffrey F | 2019-05-01 | 1 | -3/+3 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Improve socket_detached test helper to support future versions of the daemon | Joffrey F | 2019-05-01 | 1 | -4/+9 |
|/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge pull request #2326 from docker/fix_exec_demux_tests | Joffrey F | 2019-05-01 | 1 | -72/+80 |
|\ \ | | | | | | | Avoid demux test flakiness | ||||
| * | | Separate into individual testsfix_exec_demux_tests | Joffrey F | 2019-05-01 | 1 | -63/+77 |
| | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Avoid demux test flakiness | Joffrey F | 2019-04-30 | 1 | -27/+21 |
|/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
* | | Merge pull request #2309 from thaJeztah/remove_init_path_create | Joffrey F | 2019-04-30 | 2 | -14/+0 |
|\ \ | |/ |/| | Remove init_path from create | ||||
| * | Remove init_path from create | Sebastiaan van Stijn | 2019-04-10 | 2 | -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_script | Joffrey F | 2019-04-30 | 1 | -3/+3 |
|\ \ | | | | | | | Fix versions.py to include release stage | ||||
| * | | Fix versions.py to include release stagefix_versions_script | Joffrey F | 2019-04-30 | 1 | -3/+3 |
|/ / | | | | | | | Signed-off-by: Joffrey F <f.joffrey@gmail.com> | ||||
* | | Merge pull request #2322 from adamtheturtle/fix-rendered-exit-code-exec-run | Joffrey F | 2019-04-27 | 1 | -1/+1 |
|\ \ | | | | | | | Replace triple backtick in exec_run documentation which caused a rend… |