summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bumped version1.1.0-releaseJoffrey F2015-03-101-1/+1
* Updated changelogJoffrey F2015-03-101-0/+29
* Fixed TLS docsJoffrey F2015-03-101-1/+1
* Merge pull request #520 from kenden/masterJoffrey F2015-03-092-2/+2
|\
| * adding response container_id to make the example clearer. kenden2015-03-091-1/+1
| * adding response container_id to make the example clearer. kenden2015-03-091-1/+1
|/
* Merge pull request #519 from TomasTomecek/document-tail-in-logsJoffrey F2015-03-061-0/+1
|\
| * docs: document parameter tail of method logsTomas Tomecek2015-03-061-0/+1
* | Fix unit testsJoffrey F2015-03-051-1/+2
* | Merge branch 'TomasTomecek-autodetect-api-version'Joffrey F2015-03-056-15/+99
|\ \ | |/ |/|
| * Mention version='auto' in docsJoffrey F2015-03-051-1/+2
| * Auto-detect integration testsJoffrey F2015-03-051-0/+22
| * Don't allow 'version' param in AutoVersionClient ctorJoffrey F2015-03-051-0/+4
| * Streamline exceptions for auto version ; retrieve_server_version into protect...Joffrey F2015-03-051-7/+12
| * detect server version when version="auto"Tomas Tomecek2015-03-054-14/+66
|/
* Bump requests versionJoffrey F2015-03-043-3/+3
* Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-03-044-38/+63
|\
| * Merge pull request #511 from rmohr/fix-open-filesJoffrey F2015-03-041-32/+31
| |\
| | * Properly close files and sockets in unit testsRoman Mohr2015-02-281-32/+31
| * | Merge pull request #514 from dlorenc/masterJoffrey F2015-03-031-1/+1
| |\ \ | | |/ | |/|
| | * Handle passwords with ':' characters.dlorenc2015-03-031-1/+1
| |/
| * Merge pull request #502 from cpuguy83/498_dockerignore_special_namesJoffrey F2015-02-272-0/+10
| |\
| | * Add special cases for .dockerignoreBrian Goff2015-02-242-0/+10
| * | Merge pull request #509 from docker/lxc_driver_test_compatJoffrey F2015-02-271-4/+16
| |\ \
| | * | I suck at pythonlxc_driver_test_compatJoffrey F2015-02-261-5/+5
| | * | Ensure integration tests work with LXC exec driverJoffrey F2015-02-261-4/+16
| | |/
| * | Merge pull request #508 from docker/de-i11003Joffrey F2015-02-271-1/+5
| |\ \
| | * | Rename test fix to take into account docker/docker#11003de-i11003Joffrey F2015-02-261-1/+5
| | |/
* | | Merge branch 'ssanderson-py3-json'Joffrey F2015-03-041-0/+2
|\ \ \ | |/ / |/| |
| * | Only call decode if Python 3.xJoffrey F2015-03-041-1/+3
| * | Merge branch 'py3-json' of https://github.com/ssanderson/docker-py into ssand...Joffrey F2015-03-041-1/+1
| |\ \ |/ / /
| * | BUG: Fix errors in Python 3 from JSON-decoding bytes.Scott Sanderson2015-02-241-1/+1
| |/
* | Merge branch 'aanand-fix-resolve-authconfig'Joffrey F2015-02-273-30/+29
|\ \ | |/ |/|
| * shorter convert_to_hostnameJoffrey F2015-02-271-3/+1
| * Update resolve_authconfig to bring it in line with Docker clientAanand Prasad2015-02-273-30/+31
|/
* Merge pull request #500 from dnephin/support_build_dockerfileJoffrey F2015-02-233-2/+15
|\
| * Resolves #497 - add support for dockerfileDaniel Nephin2015-02-203-2/+15
|/
* Merge pull request #494 from tianon/fix-host-assumptionsJoffrey F2015-02-161-2/+2
|\
| * Fix several DOCKER_HOST assumptions in integration_test.pyTianon Gravi2015-02-161-2/+2
* | Back to dev versionJoffrey F2015-02-161-1/+1
|/
* Fix pep8 error1.0.0Joffrey F2015-02-161-2/+2
* Merge pull request #493 from docker/1.0.0-releaseJoffrey F2015-02-164-157/+163
|\
| * 1.0.0 changelog1.0.0-releaseJoffrey F2015-02-121-0/+29
| * Bumped version to 1.0.0Joffrey F2015-02-121-1/+1
| * FormattingJoffrey F2015-02-121-149/+129
| * Added api_version propertyJoffrey F2015-02-121-0/+4
| * Remove unused codeJoffrey F2015-02-121-7/+0
|/
* Merge pull request #492 from ggtools/json-statsJoffrey F2015-02-121-2/+2
|\
| * Add decode parameter to be able to the the stats as a dictionaryChristophe Labouisse2015-02-121-2/+2
|/
* Merge branch 'nir0s-add-stats-api-support'Joffrey F2015-02-127-1/+208
|\
View Lorry Controller Status