| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow configuring API version for integration test with env varconfig_test_api_version | Joffrey F | 2017-01-25 | 14 | -70/+90 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1412 from docker/1359-swarm-init | Joffrey F | 2017-01-25 | 4 | -9/+10 |
| |\ | | | | | Fix Swarm model init to correctly pass arguments through to init_swarm | ||||
| | * | Fix Swarm model init to correctly pass arguments through to init_swarm1359-swarm-init | Joffrey F | 2017-01-25 | 4 | -9/+10 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1410 from bayazee/master | Joffrey F | 2017-01-25 | 1 | -1/+0 |
| |\ | | | | | Remove duplicate line in exec_run documentation | ||||
| | * | Remove duplicate line in exec_run documentation | Mehdi Bayazee | 2017-01-25 | 1 | -1/+0 |
| | | | | | | | | | Signed-off-by: Mehdi Bayazee <bayazee@gmail.com> | ||||
| * | | Merge pull request #1408 from docker/1407-tar-ignore-sockets | Joffrey F | 2017-01-25 | 4 | -5/+25 |
| |\ \ | |/ |/| | Ignore socket files in utils.tar | ||||
| | * | Fix ImageNotFound detection1407-tar-ignore-sockets | Joffrey F | 2017-01-25 | 2 | -3/+3 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Ignore socket files in utils.tar | Joffrey F | 2017-01-24 | 2 | -2/+22 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Fix milestone link | Joffrey F | 2017-01-20 | 1 | -1/+1 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Bump 2.0.2 | Joffrey F | 2017-01-20 | 1 | -0/+20 |
| | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1403 from docker/update_test_engine_versions | Joffrey F | 2017-01-20 | 1 | -1/+4 |
| |\ | | | | | Update dockerVersions | ||||
| | * | Update dockerVersionsupdate_test_engine_versions | Joffrey F | 2017-01-19 | 1 | -1/+4 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1390 from docker/1388-format-service-mode | Joffrey F | 2017-01-19 | 6 | -7/+106 |
| |\ | | | | | Convert mode argument to valid structure in create_service | ||||
| | * | Convert mode argument to valid structure in create_service1388-format-service-mode | Joffrey F | 2017-01-19 | 6 | -7/+106 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1398 from docker/docs-fixes | Joffrey F | 2017-01-19 | 11 | -101/+96 |
| |\ | | | | | Fix a number of docs formatting issues | ||||
| | * | Fix a number of docs formatting issuesdocs-fixes | Joffrey F | 2017-01-18 | 11 | -101/+96 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1399 from docker/1395-docker-py-conflict | Joffrey F | 2017-01-19 | 1 | -0/+10 |
| |\ \ | | | | | | | Prevent issues when installing docker and docker-py in the same environment | ||||
| | * | | Prevent issues when installing docker and docker-py in the same environment1395-docker-py-conflict | Joffrey F | 2017-01-18 | 1 | -0/+10 |
| | |/ | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1393 from aebm/master | Joffrey F | 2017-01-19 | 2 | -4/+9 |
| |\ \ | | | | | | | Fix #1351 | ||||
| | * | | Fix #1351 | Alejandro E. Brito Monedero | 2017-01-16 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Fix TypeError when getting the tags property from an image that has no tags. Ex: An image pulled by cryptohash. It is handled like when the image doesn't have defined the RepoTags member. Signed-off-by: Alejandro E. Brito Monedero <alejandro.monedero@gmail.com> | ||||
| * | | | Merge pull request #1389 from docker/fix-stream-helper | Joffrey F | 2017-01-18 | 1 | -26/+23 |
| |\ \ \ | | | | | | | | | Use json_stream function in decoded _stream_helper | ||||
| | * | | | Use json_stream function in decoded _stream_helperfix-stream-helper | Joffrey F | 2017-01-11 | 1 | -26/+23 |
| | | |/ | |/| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | Merge pull request #1347 from fcurella/hash | Ben Firshman | 2017-01-18 | 2 | -0/+17 |
| |\ \ \ | |_|/ |/| | | Make resources hashable, so that they can be added to `set`s | ||||
| | * | | Make resources hashable, so that they can be added to `set`s | Flavio Curella | 2016-12-08 | 2 | -0/+17 |
| | | | | | | | | | | | | | Signed-off-by: Flavio Curella <flavio.curella@gmail.com> | ||||
| * | | | Merge pull request #1392 from graingert/case-pypi-correctly | Joffrey F | 2017-01-13 | 2 | -2/+2 |
| |\ \ \ | |_|/ |/| | | case PyPI correctly | ||||
| | * | | case PyPI correctly | Thomas Grainger | 2017-01-13 | 2 | -2/+2 |
| |/ / | | | | | | | Signed-off-by: Thomas Grainger <tom.grainger@procensus.com> | ||||
| * | | Bump 2.0.1 | Joffrey F | 2017-01-09 | 1 | -0/+13 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1385 from docker/1376-parse-mount-type | Joffrey F | 2017-01-09 | 2 | -13/+48 |
| |\ \ | | | | | | | Detect mount type in parse_mount_string | ||||
| | * | | Detect mount type in parse_mount_string1376-parse-mount-type | Joffrey F | 2017-01-09 | 2 | -13/+48 |
| |/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1384 from docker/dzimine-dz-fix-mount_options | Joffrey F | 2017-01-09 | 3 | -9/+44 |
| |\ \ | | | | | | | Fix parse_mount_string | ||||
| | * | | Raise InvalidArgument exception when invalid arguments are provideddzimine-dz-fix-mount_options | Joffrey F | 2017-01-09 | 2 | -6/+10 |
| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Additional parse_mount_string tests | Joffrey F | 2017-01-09 | 2 | -18/+32 |
| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Merge branch 'dz-fix-mount_options' of https://github.com/dzimine/docker-py ↵ | Joffrey F | 2017-01-09 | 2 | -1/+18 |
| | |\ \ |/ / / | | | | | | | | | | | | | into dzimine-dz-fix-mount_options Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Fix readonly in mounts. | Dmitri | 2016-12-28 | 2 | -1/+18 |
| | | | | | | | | | | Signed-off-by: Dmitri Zimine dz@stackstorm.com | ||||
| * | | | Merge pull request #1379 from docker/compose-4302-dockerignore-windows | Joffrey F | 2017-01-09 | 2 | -9/+35 |
| |\ \ \ | | | | | | | | | Accept / as a path separator in dockerignore patterns on all platforms | ||||
| | * | | | Accept / as a path separator in dockerignore patterns on all platformscompose-4302-dockerignore-windows | Joffrey F | 2017-01-06 | 2 | -9/+35 |
| |/ / / | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | | Merge pull request #1362 from qazbnm456/add_filters_to_networks | Joffrey F | 2017-01-05 | 1 | -7/+10 |
| |\ \ \ | |/ / |/| | | Add filters option to NetworkApiMixin.networks | ||||
| | * | | Add filters option to NetworkApiMixin.networks | Lobsiinvok | 2017-01-05 | 1 | -7/+10 |
| |/ / | | | | | | | Signed-off-by: Boik <qazbnm456@gmail.com> | ||||
| * | | Merge pull request #1350 from docker/changelog-update | Joffrey F | 2016-12-12 | 3 | -5/+120 |
| |\ \ | | | | | | | Changelog update | ||||
| | * | | Bump version number to next devchangelog-update | Joffrey F | 2016-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Remove development version warning from README | Joffrey F | 2016-12-12 | 1 | -4/+0 |
| | | | | | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | | Bump version and update Changelog | Joffrey F | 2016-12-12 | 2 | -1/+120 |
| |/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1332 from docker/docker_sdk_rename | Joffrey F | 2016-12-12 | 5 | -22/+24 |
| |\ \ | | | | | | | Rename all meaningful occurrences of docker-py to docker-sdk-python | ||||
| | * | | Rename non-URL occurrences of docker-py to "Docker SDK for Python"docker_sdk_rename | Joffrey F | 2016-12-12 | 5 | -22/+24 |
| |/ / | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1342 from docker/jenkinsfile | Joffrey F | 2016-12-08 | 8 | -19/+121 |
| |\ \ | |/ |/| | Add Jenkinsfile for integration tests matrix | ||||
| | * | Prevent Swarm address conflictsjenkinsfile | Joffrey F | 2016-12-08 | 8 | -28/+48 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| | * | Add Jenkinsfile for integration tests matrix | Joffrey F | 2016-12-08 | 1 | -0/+82 |
| |/ | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | Merge pull request #1338 from docker/remove_node | Joffrey F | 2016-12-07 | 3 | -0/+64 |
| |\ | | | | | Implement swarm node removal | ||||
| | * | Implement swarm node removalremove_node | Joffrey F | 2016-12-07 | 3 | -0/+64 |
| | | | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com> | ||||
| * | | Merge pull request #1340 from docker/dnephin-add-attachable | Joffrey F | 2016-12-07 | 11 | -24/+75 |
| |\ \ | | | | | | | Add attachable option in create_network | ||||
 |
index : delta/docker-py.git | |
| github.com: dotcloud/docker-py.git |
| summaryrefslogtreecommitdiff |