summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added git@ as a valid prefix for remote build pathsfix_640Joffrey F2015-06-301-1/+1
* Fix small decorator issueJoffrey F2015-06-301-2/+2
* Merge branch 'posita-id-resolution-in-check-resource'Joffrey F2015-06-303-70/+22
|\
| * CleanupJoffrey F2015-06-301-3/+2
| * Merge branch 'id-resolution-in-check-resource' of https://github.com/posita/d...Joffrey F2015-06-303-69/+22
| |\ |/ /
| * Move image/container ID resolution to @check_resource decorator.Matt Bogosian2015-05-203-69/+22
* | Merge pull request #653 from docker/fix_649Joffrey F2015-06-242-1/+6
|\ \
| * | Fix stop timeout bugfix_649Joffrey F2015-06-242-1/+6
|/ /
* | Merge pull request #645 from docker/update-websocket-client-depAanand Prasad2015-06-195-30/+5
|\ \
| * | Simplified tox configupdate-websocket-client-depJoffrey F2015-06-191-19/+1
| * | Updated websocket-client dependency to latest version (now supports python 3)Joffrey F2015-06-194-11/+4
|/ /
* | Merge branch 'cesanta-master'Joffrey F2015-06-191-3/+8
|\ \
| * | Support 401 status for v2 registry endpointJoffrey F2015-06-191-3/+6
| * | Merge branch 'master' of https://github.com/cesanta/docker-py into cesanta-ma...Joffrey F2015-06-191-1/+3
| |\ \ |/ / /
| * | Fix pinging an unauthenticated v2 registryMarko Mikulicic2015-05-291-1/+3
* | | Added Aanand (@aanand) as a maintainerJoffrey F2015-06-191-2/+2
* | | Merge branch 'glogiotatidis-pullfix'Joffrey F2015-06-191-1/+4
|\ \ \
| * \ \ Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into glo...Joffrey F2015-06-191-1/+4
| |\ \ \ |/ / / /
| * | | Fix pull parameter for docker server version < 1.7.Giorgos Logiotatidis2015-06-011-0/+6
| * | | Set default value for pull to False on build(). Fixes 622.Giorgos Logiotatidis2015-06-011-1/+1
| |/ /
* | | Merge pull request #614 from ibuildthecloud/extra-host-listJoffrey F2015-06-181-1/+1
|\ \ \
| * | | Allow extra_hosts to be a list tooDarren Shepherd2015-05-271-1/+1
* | | | Merge pull request #609 from mattmoor/masterJoffrey F2015-06-181-1/+1
|\ \ \ \
| * | | | Update docker-py to use a more portable sense of HOME.Matt Moore2015-05-211-1/+1
| |/ / /
* | | | Merge branch 'ssanderson-use-wraps'Joffrey F2015-06-181-0/+4
|\ \ \ \
| * | | | Fixed import styleJoffrey F2015-06-181-2/+3
| * | | | Merge branch 'use-wraps' of https://github.com/ssanderson/docker-py into ssan...Joffrey F2015-06-181-0/+3
| |\ \ \ \ |/ / / / /
| * | | | Use functools.wraps for check_resource decorator.Scott Sanderson2015-06-021-0/+3
| | |/ / | |/| |
* | | | Merge branch 'aanand-allow-any-mode'Joffrey F2015-06-183-3/+63
|\ \ \ \
| * \ \ \ Merge branch 'allow-any-mode' of https://github.com/aanand/docker-py into aan...Joffrey F2015-06-183-3/+63
| |\ \ \ \ |/ / / / /
| * | | | Allow any mode string to be passed into a volume bindAanand Prasad2015-06-053-3/+63
| |/ / /
* | | | Merge pull request #633 from edmorley/update-b2d-shellinit-exampleJoffrey F2015-06-181-4/+1
|\ \ \ \
| * | | | Docs: Update boot2docker shellinit example to use 'eval'Ed Morley2015-06-101-4/+1
| |/ / /
* | | | Bumped default API version == 1.19Joffrey F2015-06-182-2/+2
* | | | Only allow volume_driver param if API version >= 1.19Joffrey F2015-06-181-3/+8
* | | | Enforce consistent style for push and pull methodsJoffrey F2015-06-181-10/+13
* | | | small doc fixesJoffrey F2015-06-181-3/+3
* | | | Bumped version to 1.3.0 (dev)Joffrey F2015-06-181-1/+1
* | | | Add and document a decode parameter for buildPhilipp Möller2015-06-182-2/+5
* | | | Add raise_for_status check to push and pull methodsBradley Cicenas2015-06-181-0/+4
* | | | Add volume_driver param to client.create_containerLuke Marsden2015-06-184-3/+37
* | | | Updated mkdocs to use the new pages index formatJoffrey F2015-06-181-10/+10
* | | | Updated site_url value in mkdocs file1.2.3Joffrey F2015-06-181-1/+1
* | | | Fixed integration testJoffrey F2015-06-181-1/+1
* | | | Release 1.2.3Joffrey F2015-06-182-1/+2
* | | | Merge branch '1.3.0-rc0'Joffrey F2015-06-185-2/+81
|\ \ \ \ | |/ / / |/| | |
| * | | Updated ChangeLog for 1.2.31.3.0-rc0Joffrey F2015-06-161-1/+28
| * | | Bump RC1.2.3-rc1Joffrey F2015-06-121-1/+1
| * | | Merge branch 'aanand-allow-binds-list' into 1.3.0-rc0Joffrey F2015-06-124-2/+57
| |\ \ \
| | * | | Allow binds to be specified as a list of stringsAanand Prasad2015-06-123-0/+46
| |/ / / |/| | |