summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #436 from docker/0.7.0-release0.7.0Joffrey F2014-12-199-107/+132
|\
| * Use create_host_config in start (unifying parameter processing)0.7.0-releaseJoffrey F2014-12-184-81/+27
| * Improved integration tests to run on python3 and close sessions after in tear...Joffrey F2014-12-181-22/+50
| * Fix create_container environment parameter for python3Joffrey F2014-12-181-2/+2
| * Updated documentationJoffrey F2014-12-182-1/+5
| * Added support for extra_hosts in create_host_configJoffrey F2014-12-181-1/+11
| * Updated changelogJoffrey F2014-12-181-0/+37
| * Bumped versionJoffrey F2014-12-181-1/+1
|/
* Merge pull request #427 from abanna/adding_multiple_dockercfg_supportJoffrey F2014-12-183-9/+49
|\
| * updated parameter name to make more sense.abanna2014-12-181-6/+4
| * missed a lint errorabanna2014-12-181-2/+4
| * adding the ability to login with different dockercfg files.Alex Banna2014-12-183-8/+48
* | Merge pull request #435 from dims/fix-flake8-issuesJoffrey F2014-12-182-3/+4
|\ \
| * | flake8 fails with F821 for unicode under python 3.4.2Davanum Srinivas2014-12-182-3/+4
| |/
* | Merge pull request #432 from leth/fix_test_raceJoffrey F2014-12-181-23/+29
|\ \ | |/ |/|
| * Tidy up stream test harness & fix race conditionsMarcus Cobden2014-12-181-23/+29
|/
* Retry on connection errorJoffrey F2014-12-171-4/+11
* Use unicode() typecast instead of u'' literal (3.2 compat). Fixes #408Joffrey F2014-12-171-2/+2
* Merge branch 'leth-master'Joffrey F2014-12-172-24/+98
|\
| * Merge branch 'master' of https://github.com/leth/docker-py into leth-masterJoffrey F2014-12-172-24/+98
| |\ |/ /
| * Consume from chunked streams without data lossMarcus Cobden2014-12-162-24/+98
* | Merge pull request #428 from docker/host_configJoffrey F2014-12-1710-170/+772
|\ \
| * | Updated documentation with HostConfig informationhost_configJoffrey F2014-12-173-6/+103
| * | Re-added integration tests with hostconfig in startJoffrey F2014-12-171-3/+162
| * | Re-added start with hostconfig testsJoffrey F2014-12-171-1/+241
| * | Un-deprecated hostconfig in startJoffrey F2014-12-171-33/+6
| * | Fixed start_container testsJoffrey F2014-12-171-16/+6
| * | assertEquals -> assertEqualJoffrey F2014-12-171-5/+5
| * | Updated integration tests to use new host_config paramJoffrey F2014-12-171-37/+52
| * | Fixed VolumesFrom bugJoffrey F2014-12-171-1/+1
| * | Prevent start_config from overriding host_config in create if no param is spe...Joffrey F2014-12-171-5/+11
| * | Updated unit testsJoffrey F2014-12-171-204/+221
| * | Updated mock API versionJoffrey F2014-12-171-1/+1
| * | Added create_host_config helper in docker.utilsJoffrey F2014-12-172-1/+68
| * | * create_container now supports a host_config paramJoffrey F2014-12-171-14/+52
|/ /
* | Merge pull request #429 from dims/masterJoffrey F2014-12-172-5/+5
|\ \
| * | Devices should be separated by colon separated stringDavanum Srinivas2014-12-172-5/+5
* | | Merge pull request #430 from bfirsh/travis-dockerJoffrey F2014-12-171-3/+1
|\ \ \ | |_|/ |/| |
| * | Run Travis tests on DockerBen Firshman2014-12-171-3/+1
|/ /
* | Merge branch 'jseybold-master'Joffrey F2014-12-152-2/+3
|\ \
| * | timeout param in wait documentedJoffrey F2014-12-151-0/+1
| * | Added timeout param to Client.waitJoffrey F2014-12-151-2/+2
|/ /
* | Merge pull request #271 from robertglen/byteIO-seekfixJoffrey F2014-12-151-0/+2
|\ \
| * | Should be done for StringIO objects as wellRobert Glen2014-07-101-0/+1
| * | Fixed bug in utils.mkbuildcontext for BytesIO DockerfilesRobert Glen2014-07-091-0/+1
* | | Added forcerm param in Client.buildJoffrey F2014-12-152-1/+4
* | | Merge pull request #423 from docker/0.6.0-integrationJoffrey F2014-12-151-20/+15
|\ \ \
| * | | Don't use old test image (deprecated ID scheme)0.6.0-integrationJoffrey F2014-12-151-14/+8
| * | | Better pull confirmationJoffrey F2014-12-151-8/+6
| * | | Longer timeout when contacting hubJoffrey F2014-12-151-0/+3
View Lorry Controller Status