summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump default API version to 1.35bump_api_version_1.35Joffrey F2018-01-2518-48/+158
* Merge pull request #1865 from docker/dperny-change-tls-defaultJoffrey F2018-01-251-7/+27
|\
| * Don't use PROTOCOL_TLSv1_2 directly to avoid ImportErrorsdperny-change-tls-defaultJoffrey F2018-01-241-15/+8
| * Change default TLS versionDrew Erny2018-01-241-7/+34
* | Merge pull request #1856 from docker/1855-platform-optionJoffrey F2018-01-247-7/+54
|\ \
| * | Add support for experimental platform flag in build and pull1855-platform-optionJoffrey F2018-01-237-7/+54
* | | Merge pull request #1849 from johannespostler/1516-endport-port-documentationJoffrey F2018-01-241-2/+2
|\ \ \
| * | | Switch ports in documentation for EndpointSpecJohannes Postler2017-12-271-2/+2
* | | | Merge pull request #1846 from feliperuhland/issue-1734-scale-methodJoffrey F2018-01-242-2/+67
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix test to make sure the initial mode is replicatedFelipe Ruhland2018-01-032-3/+3
| * | | Ensure that global containers are not scaledFelipe Ruhland2017-12-262-1/+28
| * | | Added scale method to the Service model.Felipe Ruhland2017-12-212-1/+39
| |/ /
* | | Merge pull request #1866 from docker/jenkins-updateJoffrey F2018-01-243-6/+8
|\ \ \
| * | | Shift test matrix forwardjenkins-updateJoffrey F2018-01-243-6/+8
|/ / /
* | | Merge pull request #1863 from docker/python3.6Joffrey F2018-01-228-22/+36
|\ \ \
| * | | Add Python 3.6 testingpython3.6Joffrey F2018-01-228-22/+36
|/ / /
* | | Merge pull request #1859 from rycus86/service_network_regressionJoffrey F2018-01-122-1/+32
|\ \ \ | |_|/ |/| |
| * | Fix regression on API < 1.25Viktor Adam2018-01-122-1/+32
|/ /
* | Merge pull request #1853 from docker/1852-dockerignoreJoffrey F2018-01-032-1/+25
|\ \ | |/ |/|
| * Ignore dockerignore lines that contain only whitespace1852-dockerignoreJoffrey F2018-01-032-1/+25
|/
* Merge branch 'qazbnm456-master'Joffrey F2017-12-191-1/+2
|\
| * FormattingJoffrey F2017-12-191-2/+2
| * Merge branch 'master' of https://github.com/qazbnm456/docker-py into qazbnm45...Joffrey F2017-12-191-1/+2
| |\ |/ /
| * make the error message clearerBoik2017-12-161-1/+2
* | 2.8.0 devJoffrey F2017-12-191-1/+1
* | Merge branch 'release'Joffrey F2017-12-192-1/+36
|\ \
| * \ Merge pull request #1838 from docker/2.7.0-release2.7.0Joffrey F2017-12-1933-99/+1063
| |\ \
| | * | Don't attempt to retrieve container's stderr if `auto_remove` was set2.7.0-releaseJoffrey F2017-12-192-2/+16
| | * | Bump 2.7.0 + changelogJoffrey F2017-12-182-1/+36
* | | | Merge pull request #1840 from docker/1813-autoremove-errorJoffrey F2017-12-192-2/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't attempt to retrieve container's stderr if `auto_remove` was set1813-autoremove-errorJoffrey F2017-12-192-2/+16
|/ / /
* | | Merge pull request #1727 from mbelang/join-swarn-default-listen-addressJoffrey F2017-12-183-1/+50
|\ \ \
| * | | Add join_swarm default listen addressMaxime Belanger2017-08-293-1/+50
* | | | Merge pull request #1828 from pkit/fix_error_from_httpexJoffrey F2017-12-182-2/+16
|\ \ \ \
| * | | | fixes create_api_error_from_http_exception()Constantine Peresypkin2017-12-182-2/+16
* | | | | Merge pull request #1836 from docker/1813-run-autoremoveJoffrey F2017-12-144-18/+43
|\ \ \ \ \
| * | | | | Retrieve container logs before container exits / is removed1813-run-autoremoveJoffrey F2017-12-144-18/+43
* | | | | | Merge pull request #1837 from feliperuhland/fix_default_api_versionJoffrey F2017-12-142-10/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed DEFAULT API VERSION in docstrings.Felipe Ruhland2017-12-142-10/+10
|/ / / / /
* | | | | Merge pull request #1807 from rycus86/update_service_from_prev_specJoffrey F2017-12-146-21/+659
|\ \ \ \ \
| * | | | | Renaming new argumentViktor Adam2017-12-143-48/+41
| * | | | | Fix resetting ContainerSpec properties to NoneViktor Adam2017-11-152-6/+7
| * | | | | Attempting to make service update tests less flakyViktor Adam2017-11-152-4/+10
| * | | | | Service model update changesViktor Adam2017-11-146-56/+345
| * | | | | Update service using previous specViktor Adam2017-11-142-8/+357
* | | | | | Merge pull request #1834 from mhank/1823-support-update-orderJoffrey F2017-12-143-1/+32
|\ \ \ \ \ \
| * | | | | | Correct default value of order parameterMichael Hankin2017-12-141-7/+7
| * | | | | | Add support for order property when updating a serviceMichael Hankin2017-12-123-1/+32
* | | | | | | Merge pull request #1835 from docker/1758-url-quote-pathJoffrey F2017-12-132-1/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix URL-quoting for resource names containing spaces1758-url-quote-pathJoffrey F2017-12-132-1/+8
| |/ / / / / /