summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | removed unneeded importsYuval Kohavi2015-04-171-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
| * | | | line lengthYuval Kohavi2015-04-111-3/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
| * | | | python 2.6 compatibleYuval Kohavi2015-04-111-6/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
| * | | | added ports to setup.pyYuval Kohavi2015-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
| * | | | Adding port utils to split port rangesYuval Kohavi2015-04-033-0/+185
|/ / / / | | | | | | | | | | | | Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
* | | | Use assertRaises in a backward compatible fashionJoffrey F2015-03-251-2/+4
| | | |
* | | | Added assertIn shim for py2.6Joffrey F2015-03-251-0/+5
| | | |
* | | | Merge branch 'ewindisch-secopt'Joffrey F2015-03-254-4/+34
|\ \ \ \
| * | | | docs and unit test for security_optJoffrey F2015-03-252-0/+14
| | | | |
| * | | | Added some type and version checks; removed security_opt from ↵Joffrey F2015-03-252-5/+14
| | | | | | | | | | | | | | | | | | | | container_config (as this is invalid)
| * | | | Add security_opt for create/startEric Windisch2015-03-242-7/+14
|/ / / / | | | | | | | | | | | | Signed-off-by: Eric Windisch <eric@windisch.us>
* | | | Merge pull request #533 from ynachiket/masterJoffrey F2015-03-211-1/+1
|\ \ \ \ | | | | | | | | | | Fixed stats related typo in api.md
| * | | | Fixed stats related typo in api.mdynachiket2015-03-211-1/+1
|/ / / /
* | | | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-03-205-8/+67
|\ \ \ \
| * \ \ \ Merge pull request #531 from josephpage/dockerignore-eof-windowsJoffrey F2015-03-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | Windows : fix EOL of .dockerignore file
| | * | | | Windows : str.splitlines instead of str.splitJoseph Page2015-03-201-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | To be able to read `.dockerignore` file edited on Windows, python-py may use the multi-platform split function `str.splitlines()` Ref : https://docs.python.org/2/library/stdtypes.html#str.splitlines
| * | | | Merge pull request #532 from aanand/labelsJoffrey F2015-03-205-7/+66
| |\ \ \ \ | | | | | | | | | | | | Labels
| | * | | | Finish labels implementation, add tests and docsAanand Prasad2015-03-203-6/+54
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| | * | | | Update default API version to 1.18Aanand Prasad2015-03-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| | * | | | Implemented labels for docker-pyAndré Martins2015-03-172-4/+15
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: André Martins <martins@noironetworks.com>
* | | | | Use get instead of bracket notationJoffrey F2015-03-201-1/+1
| | | | |
* | | | | Merge branch 'fix-port-host-net' of https://github.com/ssanderson/docker-py ↵Joffrey F2015-03-201-2/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into ssanderson-fix-port-host-net
| * | | | MAINT: Don't re-index multiple times.Scott Sanderson2015-03-161-2/+2
| | | | |
| * | | | BUG: Don't barf on Client.port when no port settings provided.Scott Sanderson2015-03-161-0/+6
| | | | |
* | | | | Back to dev versionJoffrey F2015-03-201-1/+1
| |/ / / |/| | |
* | | | Merge pull request #523 from docker/1.1.0-release1.1.0Joffrey F2015-03-112-1/+30
|\ \ \ \ | | | | | | | | | | 1.1.0 release
| * | | | 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