summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prevent issues when installing docker and docker-py in the same environment1395-docker-py-conflictJoffrey F2017-01-181-0/+10
* 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
* | | | Merge pull request #1330 from docker/walkerlee-masterJoffrey F2016-12-022-2/+9
|\ \ \ \
| * | | | Add options to IPAMConfigwalkerlee-masterJoffrey F2016-12-021-1/+8
| * | | | Merge branch 'master' of https://github.com/walkerlee/docker-py into walkerle...Joffrey F2016-12-021-1/+1
| |\ \ \ \
| | * | | | Add docker network IPAM options parameterWalker Lee2016-10-274-4/+11
* | | | | | Merge pull request #1327 from docker/compose4171_build_auth_headersJoffrey F2016-12-021-3/+19
|\ \ \ \ \ \
| * | | | | | Properly fill out auth headers in APIClient.build when usingcompose4171_build_auth_headersJoffrey F2016-12-011-3/+19
* | | | | | | Merge pull request #1329 from docker/manics-patch-1Joffrey F2016-12-023-2/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'patch-1' of https://github.com/manics/docker-py into manics-pat...manics-patch-1Joffrey F2016-12-023-2/+22
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Add test for creating service with envSimon Li2016-11-111-0/+16
| * | | | | | Use format_environment to convert env in ContainerSpecSimon Li2016-11-112-2/+6
* | | | | | | Merge pull request #1324 from docker/requests_2.12.2Joffrey F2016-12-021-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Exclude requests==2.12.2 from dependenciesrequests_2.12.2Joffrey F2016-11-301-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1328 from docker/ssladapter_transport_moduleBen Firshman2016-12-025-8/+8
|\ \ \ \ \ \
| * | | | | | Move ssladapter to transport modulessladapter_transport_moduleJoffrey F2016-12-015-8/+8
| | |_|/ / / | |/| | | |
View Lorry Controller Status