summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add prune_volumes methodprunesJoffrey F2017-01-304-1/+36
* Add prune_images methodJoffrey F2017-01-304-14/+47
* Add prune_containers methodJoffrey F2017-01-273-3/+53
* Merge pull request #1421 from shin-/add_stop_timeoutJoffrey F2017-01-276-8/+31
|\
| * Add stop_timeout to create_containerJoffrey F2017-01-276-8/+31
|/
* Merge pull request #1413 from docker/force_remove_volumeJoffrey F2017-01-263-7/+33
|\
| * Add 'force' parameter in remove_volumeforce_remove_volumeJoffrey F2017-01-263-7/+33
* | Merge pull request #1419 from docker/remove_obsolete_search_testJoffrey F2017-01-261-7/+0
|\ \
| * | Remove integration test for APIClient.search methodremove_obsolete_search_testJoffrey F2017-01-261-7/+0
* | | Merge pull request #1415 from docker/autoremove_supportJoffrey F2017-01-264-1/+22
|\ \ \
| * | | Add support for auto_remove in HostConfigautoremove_supportJoffrey F2017-01-254-1/+22
* | | | Merge pull request #1417 from graingert/cachefromJoffrey F2017-01-263-1/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Add cachefrom to build docstringThomas Grainger2017-01-261-0/+1
| * | | Implement cachefromThomas Schaaf2017-01-262-1/+28
|/ / /
* | | Merge pull request #1414 from docker/config_test_api_versionJoffrey F2017-01-2514-70/+90
|\ \ \ | |/ / |/| |
| * | Allow configuring API version for integration test with env varconfig_test_api_versionJoffrey F2017-01-2514-70/+90
|/ /
* | Merge pull request #1412 from docker/1359-swarm-initJoffrey F2017-01-254-9/+10
|\ \ | |/ |/|
| * Fix Swarm model init to correctly pass arguments through to init_swarm1359-swarm-initJoffrey F2017-01-254-9/+10
|/
* Merge pull request #1410 from bayazee/masterJoffrey F2017-01-251-1/+0
|\
| * Remove duplicate line in exec_run documentationMehdi Bayazee2017-01-251-1/+0
* | Merge pull request #1408 from docker/1407-tar-ignore-socketsJoffrey F2017-01-254-5/+25
|\ \ | |/ |/|
| * Fix ImageNotFound detection1407-tar-ignore-socketsJoffrey F2017-01-252-3/+3
| * Ignore socket files in utils.tarJoffrey F2017-01-242-2/+22
|/
* Fix milestone linkJoffrey F2017-01-201-1/+1
* Bump 2.0.2Joffrey F2017-01-201-0/+20
* Merge pull request #1403 from docker/update_test_engine_versionsJoffrey F2017-01-201-1/+4
|\
| * 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
|\ \ \