summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update dockerVersionsupdate_test_engine_versionsJoffrey F2017-01-191-1/+4
* Merge pull request #1390 from docker/1388-format-service-modeJoffrey F2017-01-196-7/+106
|\
| * Convert mode argument to valid structure in create_service1388-format-service-modeJoffrey F2017-01-196-7/+106
|/
* Merge pull request #1398 from docker/docs-fixesJoffrey F2017-01-1911-101/+96
|\
| * Fix a number of docs formatting issuesdocs-fixesJoffrey F2017-01-1811-101/+96
* | Merge pull request #1399 from docker/1395-docker-py-conflictJoffrey F2017-01-191-0/+10
|\ \
| * | Prevent issues when installing docker and docker-py in the same environment1395-docker-py-conflictJoffrey F2017-01-181-0/+10
| |/
* | Merge pull request #1393 from aebm/masterJoffrey F2017-01-192-4/+9
|\ \
| * | Fix #1351Alejandro E. Brito Monedero2017-01-162-4/+9
* | | Merge pull request #1389 from docker/fix-stream-helperJoffrey F2017-01-181-26/+23
|\ \ \
| * | | Use json_stream function in decoded _stream_helperfix-stream-helperJoffrey F2017-01-111-26/+23
| | |/ | |/|
* | | Merge pull request #1347 from fcurella/hashBen Firshman2017-01-182-0/+17
|\ \ \ | |_|/ |/| |
| * | Make resources hashable, so that they can be added to `set`sFlavio Curella2016-12-082-0/+17
* | | Merge pull request #1392 from graingert/case-pypi-correctlyJoffrey F2017-01-132-2/+2
|\ \ \ | |_|/ |/| |
| * | case PyPI correctlyThomas Grainger2017-01-132-2/+2
|/ /
* | Bump 2.0.1Joffrey F2017-01-091-0/+13
* | Merge pull request #1385 from docker/1376-parse-mount-typeJoffrey F2017-01-092-13/+48
|\ \
| * | Detect mount type in parse_mount_string1376-parse-mount-typeJoffrey F2017-01-092-13/+48
|/ /
* | Merge pull request #1384 from docker/dzimine-dz-fix-mount_optionsJoffrey F2017-01-093-9/+44
|\ \
| * | Raise InvalidArgument exception when invalid arguments are provideddzimine-dz-fix-mount_optionsJoffrey F2017-01-092-6/+10
| * | Additional parse_mount_string testsJoffrey F2017-01-092-18/+32
| * | Merge branch 'dz-fix-mount_options' of https://github.com/dzimine/docker-py i...Joffrey F2017-01-092-1/+18
| |\ \ |/ / /
| * | Fix readonly in mounts.Dmitri2016-12-282-1/+18
* | | Merge pull request #1379 from docker/compose-4302-dockerignore-windowsJoffrey F2017-01-092-9/+35
|\ \ \
| * | | Accept / as a path separator in dockerignore patterns on all platformscompose-4302-dockerignore-windowsJoffrey F2017-01-062-9/+35
|/ / /
* | | Merge pull request #1362 from qazbnm456/add_filters_to_networksJoffrey F2017-01-051-7/+10
|\ \ \ | |/ / |/| |
| * | Add filters option to NetworkApiMixin.networksLobsiinvok2017-01-051-7/+10
|/ /
* | Merge pull request #1350 from docker/changelog-updateJoffrey F2016-12-123-5/+120
|\ \
| * | Bump version number to next devchangelog-updateJoffrey F2016-12-121-1/+1
| * | Remove development version warning from READMEJoffrey F2016-12-121-4/+0
| * | Bump version and update ChangelogJoffrey F2016-12-122-1/+120
|/ /
* | Merge pull request #1332 from docker/docker_sdk_renameJoffrey F2016-12-125-22/+24
|\ \
| * | Rename non-URL occurrences of docker-py to "Docker SDK for Python"docker_sdk_renameJoffrey F2016-12-125-22/+24
|/ /
* | Merge pull request #1342 from docker/jenkinsfileJoffrey F2016-12-088-19/+121
|\ \ | |/ |/|
| * Prevent Swarm address conflictsjenkinsfileJoffrey F2016-12-088-28/+48
| * Add Jenkinsfile for integration tests matrixJoffrey F2016-12-081-0/+82
|/
* Merge pull request #1338 from docker/remove_nodeJoffrey F2016-12-073-0/+64
|\
| * Implement swarm node removalremove_nodeJoffrey F2016-12-073-0/+64
* | Merge pull request #1340 from docker/dnephin-add-attachableJoffrey F2016-12-0711-24/+75
|\ \
| * | Update code and tests for Engine 1.13 compatibilitydnephin-add-attachableJoffrey F2016-12-0711-27/+53
| * | Fix typo in create_networkJoffrey F2016-12-062-4/+16
| * | Add attachable.Daniel Nephin2016-12-052-2/+15
* | | Merge pull request #1339 from docker/min_version_1.21Ben Firshman2016-12-061-1/+1
|\ \ \ | |/ / |/| |
| * | Minimum version 1.24 -> 1.21min_version_1.21Joffrey F2016-12-051-1/+1
| |/
* | Merge pull request #1272 from TomasTomecek/1271-fix-detach-in-exec-startBen Firshman2016-12-052-1/+17
|\ \
| * | exec: fix running with detach=TrueTomas Tomecek2016-11-292-1/+17
* | | Merge pull request #1331 from aanand/fix-auth-config-path-windowsJoffrey F2016-12-022-12/+77
|\ \ \ | |_|/ |/| |
| * | Fix auth config path on WindowsAanand Prasad2016-12-022-12/+77
* | | Merge pull request #1315 from bfirsh/rename-docker-py-to-docker-sdk-pythonJoffrey F2016-12-029-37/+37
|\ \ \
| * | | Start to rename docker-py to docker-sdk-pythonBen Firshman2016-11-289-37/+37
View Lorry Controller Status