summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use pytest assertspytest-assertsJoffrey F2018-01-3028-1608/+1270
* Merge branch 'funkyfuture-container_exec_run'Joffrey F2018-01-291-6/+16
|\
| * Move ExecResult definition to models.containersJoffrey F2018-01-293-13/+13
| * Merge branch 'container_exec_run' of https://github.com/funkyfuture/docker-py...Joffrey F2018-01-293-8/+18
| |\ |/ /
| * Container.exec_run returns a namedtuple w/ attrs exit_code & outputFrank Sachsenheim2018-01-283-6/+14
| * Container.exec_run returns None as exit_code if stream or socketFrank Sachsenheim2018-01-281-5/+7
* | Merge pull request #1874 from docker/1774-export-methodsJoffrey F2018-01-295-20/+53
|\ \ | |/ |/|
| * Update save / export methods to return data generators1774-export-methodsJoffrey F2018-01-265-20/+53
* | Merge pull request #1875 from docker/1702-build-logs-dockerclientJoffrey F2018-01-263-14/+24
|\ \ | |/ |/|
| * ImageCollection.build now also returns build logs along with the built image ...1702-build-logs-dockerclientJoffrey F2018-01-263-14/+24
|/
* Merge pull request #1873 from docker/hongbin-image-loadJoffrey F2018-01-263-3/+26
|\
| * Error handling in ImageCollection.loadhongbin-image-loadJoffrey F2018-01-263-1/+13
| * Merge branch 'image-load' of https://github.com/hongbin/docker-py into hongbi...Joffrey F2018-01-261-2/+13
| |\
| | * Return Image objects on image.loadHongbin Lu2017-09-101-2/+13
* | | Merge pull request #1872 from docker/hnq90-add_exit_code_to_exec_runJoffrey F2018-01-263-7/+39
|\ \ \ | |/ / |/| |
| * | Return tuple instead of dict in exec_runJoffrey F2018-01-263-14/+13
| * | Merge branch 'add_exit_code_to_exec_run' of https://github.com/hnq90/docker-p...Joffrey F2018-01-263-7/+40
| |\ \ |/ / /
| * | Add exit code to exec_runHuyNQ2017-11-133-7/+40
* | | Merge pull request #1867 from docker/bump_api_version_1.35Joffrey F2018-01-2612-27/+129
|\ \ \
| * | | Bump default API version to 1.35Joffrey F2018-01-2612-27/+129
|/ / /
* | | Merge pull request #1871 from docker/fix-appveyorJoffrey F2018-01-263-4/+8
|\ \ \
| * | | Fix appveyor testsJoffrey F2018-01-263-4/+8
|/ / /
* | | Merge pull request #1869 from mccalluc/patch-1Joffrey F2018-01-261-1/+1
|\ \ \
| * | | Replace missing "^" with "e"mccalluc2018-01-261-1/+1
|/ / /
* | | 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
| |\ \ \ \
View Lorry Controller Status