summaryrefslogtreecommitdiff
Commit message (Collapse)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
|\ | | | | Making examples in doc a bit clearer for volumes and ports_binding
| * adding response container_id to make the example clearer. kenden2015-03-091-1/+1
| | | | | | Without it, c.start refer to container_id, which has not been introduced before.
| * adding response container_id to make the example clearer. kenden2015-03-091-1/+1
|/ | | Without this, c.start refers to container_id, which has not been introduced before
* Merge pull request #519 from TomasTomecek/document-tail-in-logsJoffrey F2015-03-061-0/+1
|\ | | | | docs: document parameter tail of method logs
| * 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 ↵Joffrey F2015-03-051-7/+12
| | | | | | | | protected method
| * detect server version when version="auto"Tomas Tomecek2015-03-054-14/+66
|/ | | | | | heavily inspired by PR#281 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
* 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 tests
| | * 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.
| | * Handle passwords with ':' characters.dlorenc2015-03-031-1/+1
| |/ | | | | | | Signed-off-by: dlorenc <lorenc.d@gmail.com>
| * Merge pull request #502 from cpuguy83/498_dockerignore_special_namesJoffrey F2015-02-272-0/+10
| |\ | | | | | | Add special cases for .dockerignore
| | * Add special cases for .dockerignoreBrian Goff2015-02-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #498 Allowing `Dockerfile` and `.dockerignore` in the exclusion filter completely breaks the build on docker < 1.5 In Docker 1.5 these entries are treated as special cases when included in the .dockerignore and are still sent as part of the context. The daemon ends up excluding them from any `ADD`, `COPY`, and cache validation. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
| * | Merge pull request #509 from docker/lxc_driver_test_compatJoffrey F2015-02-271-4/+16
| |\ \ | | | | | | | | Lxc driver test compat
| | * | 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#11003
| | * | 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 ↵Joffrey F2015-03-041-1/+1
| |\ \ |/ / / | | | | | | ssanderson-py3-json
| * | 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
|/ | | | | | | Instead of expanding the registry name we're looking for to a full URL, strip entries in the authconfig down to just the hostname. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #500 from dnephin/support_build_dockerfileJoffrey F2015-02-233-2/+15
|\ | | | | Add support for dockerfile
| * Resolves #497 - add support for dockerfileDaniel Nephin2015-02-203-2/+15
|/ | | | Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* Merge pull request #494 from tianon/fix-host-assumptionsJoffrey F2015-02-161-2/+2
|\ | | | | Fix several DOCKER_HOST assumptions in integration_test.py
| * 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 release
| * 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 dictionary
| * 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