summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Retrieve container logs before container exits / is removed1813-run-autoremoveJoffrey F2017-12-144-18/+43
* Merge pull request #1807 from rycus86/update_service_from_prev_specJoffrey F2017-12-146-21/+659
|\
| * Renaming new argumentViktor Adam2017-12-143-48/+41
| * Fix resetting ContainerSpec properties to NoneViktor Adam2017-11-152-6/+7
| * Attempting to make service update tests less flakyViktor Adam2017-11-152-4/+10
| * Service model update changesViktor Adam2017-11-146-56/+345
| * Update service using previous specViktor Adam2017-11-142-8/+357
* | Merge pull request #1834 from mhank/1823-support-update-orderJoffrey F2017-12-143-1/+32
|\ \
| * | Correct default value of order parameterMichael Hankin2017-12-141-7/+7
| * | Add support for order property when updating a serviceMichael Hankin2017-12-123-1/+32
* | | Merge pull request #1835 from docker/1758-url-quote-pathJoffrey F2017-12-132-1/+8
|\ \ \
| * | | Fix URL-quoting for resource names containing spaces1758-url-quote-pathJoffrey F2017-12-132-1/+8
| |/ /
* | | Merge branch 'tz70s-master'Joffrey F2017-12-134-1/+60
|\ \ \
| * | | Add integration test for CPU realtime optionsJoffrey F2017-12-131-0/+14
| * | | Merge branch 'master' of https://github.com/tz70s/docker-py into tz70s-masterJoffrey F2017-12-133-1/+46
| |\ \ \ |/ / / /
| * | | Fix #1575 - Add cpu_rt_period and cpu_rt_runtime argsTzu-Chiao Yeh2017-08-133-1/+46
* | | | Merge pull request #1789 from timvisee/chardet-fixJoffrey F2017-12-131-1/+1
|\ \ \ \
| * | | | Require at least requests v2.14.2 to fix chardettimvisee2017-11-021-1/+1
* | | | | Merge pull request #1816 from Anvil/honor-stoptimeoutJoffrey F2017-12-131-3/+9
|\ \ \ \ \
| * | | | | Fix for #1815: make APIClient.stop honor container StopTimeout valueDamien Nadé2017-11-211-3/+9
* | | | | | Merge pull request #1812 from rycus86/greedy_network_listJoffrey F2017-12-133-7/+28
|\ \ \ \ \ \
| * | | | | | Only allow greedy queries on the modelViktor Adam2017-11-214-54/+9
| * | | | | | Fixing integration testsViktor Adam2017-11-192-1/+5
| * | | | | | Fetch network details with network lists greedilyViktor Adam2017-11-165-8/+70
| |/ / / / /
* | | | | | Merge pull request #1830 from mhank/1822-reformat-hostsJoffrey F2017-12-133-4/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Change format in which hosts are being stored for Swarm servicesMichael Hankin2017-12-053-4/+10
| * | | | | Change format of extra hostsMichael Hankin2017-12-033-4/+4
* | | | | | Merge pull request #1825 from docker/fix-context-buildingJoffrey F2017-12-111-7/+14
|\ \ \ \ \ \
| * | | | | | Fix common issues with build context creation: inaccessible files and fifosfix-context-buildingJoffrey F2017-11-291-7/+14
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1831 from asottile/patch-1Joffrey F2017-12-071-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | container: fix docstring for containers()Anthony Sottile2017-12-071-1/+2
|/ / / / /
* | | | | Merge pull request #1819 from alexvy86/alexvy86-patch-1Joffrey F2017-11-211-1/+1
|\ \ \ \ \
| * | | | | Add missing call to string format in log messageAlex Villarreal2017-11-211-1/+1
|/ / / / /
* | | | | Merge pull request #1798 from docker/unlock_swarm_supportJoffrey F2017-11-204-1/+70
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add unlock methods to Swarm modelunlock_swarm_supportJoffrey F2017-11-073-5/+16
| * | | | Add unlock_swarm and get_unlock_key to APIClientJoffrey F2017-11-072-1/+59
* | | | | Merge pull request #1805 from thaJeztah/fix-swarm-update-testJoffrey F2017-11-131-18/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove test_update_swarm_nameSebastiaan van Stijn2017-11-141-18/+0
|/ / / /
* | | | dev versionJoffrey F2017-11-081-1/+1
* | | | Merge pull request #1802 from docker/2.6.1-release2.6.1Joffrey F2017-11-083-8/+18
|\ \ \ \
| * | | | 2.6.1 release2.6.1-releaseJoffrey F2017-11-082-2/+13
| * | | | dev versionJoffrey F2017-11-081-1/+1
| * | | | Merge branch 'release' of github.com:docker/docker-pyJoffrey F2017-11-083-2/+57
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Update test engine versions in Jenkinsfile2.6.0Joffrey F2017-11-073-5/+5
* | | | | Bump 2.6.0Joffrey F2017-11-072-1/+45
* | | | | Style fixes. Copied docs to APIClient as wellJoffrey F2017-11-072-4/+8
* | | | | explain the socket parameter of exec_runMartin Monperrus2017-11-071-3/+5
* | | | | Add support for insert_defaults in inspect_serviceJoffrey F2017-11-073-5/+33
* | | | | Update SwarmSpec to include new parametersJoffrey F2017-11-075-18/+160
* | | | | Add support for scope filter in inspect_networkJoffrey F2017-11-073-4/+46