summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #688 from docker/1.3.1-release1.3.1Aanand Prasad2015-07-225-4/+41
|\
| * Updated Makefile to help with release testing1.3.1-releaseJoffrey F2015-07-221-2/+11
| * Added py3-based dockerfileJoffrey F2015-07-222-1/+7
| * Updated changelog for 1.3.1Joffrey F2015-07-221-0/+22
| * Bumped versionJoffrey F2015-07-221-1/+1
|/
* Merge pull request #682 from docker/moutten-fix-build-authJoffrey F2015-07-222-9/+8
|\
| * Make build auth work with API versions < 1.19 toomoutten-fix-build-authJoffrey F2015-07-201-3/+8
| * Merge branch 'fix-build-auth' of https://github.com/moutten/docker-py into mo...Joffrey F2015-07-202-7/+1
| |\
| | * Switch to send full AuthConfig object for build actionMatt Outten2015-07-172-7/+1
* | | Merge pull request #685 from paulbellamy/masterJoffrey F2015-07-211-2/+2
|\ \ \
| * | | Fix integration tests.Paul Bellamy2015-07-211-2/+2
* | | | Merge pull request #680 from aanand/fix-timestamp-conversionJoffrey F2015-07-213-6/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Enforce UTC datetimes in arguments to `events()`Aanand Prasad2015-07-213-6/+6
| | |/ | |/|
* | | Merge pull request #674 from estesp/use-docker-host-in-testsAanand Prasad2015-07-211-3/+4
|\ \ \
| * | | Update all client instances in integration tests to use DOCKER_HOSTPhil Estes2015-07-141-3/+4
| |/ /
* | | Merge pull request #683 from docker/exec_create_check_dictAanand Prasad2015-07-211-0/+1
|\ \ \ | |_|/ |/| |
| * | Added check_resource decorator to exec_createexec_create_check_dictJoffrey F2015-07-201-0/+1
|/ /
* | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2015-07-203-2/+12
|\ \
| * \ Merge pull request #678 from pdericson/docsJoffrey F2015-07-201-2/+6
| |\ \
| | * | docs/api.md: rework stats paramsPeter Ericson2015-07-191-1/+5
| | * | docs/api.md: singal -> signalPeter Ericson2015-07-191-1/+1
| | |/
| * | Merge pull request #676 from larsks/feature/notfound-on-404Aanand Prasad2015-07-202-0/+6
| |\ \ | | |/ | |/|
| | * return NotFound on 404 errorsLars Kellogg-Stedman2015-07-172-0/+6
| |/
* | Merge branch 'aanand-remove-registry-ping'Joffrey F2015-07-207-31/+143
|\ \ | |/ |/|
| * Use constant for deprecation message in auth.pyJoffrey F2015-07-202-6/+8
| * Stop pinging registries from the clientAanand Prasad2015-07-207-28/+138
|/
* Merge branch 'a-ba-fix-premature-eof'Joffrey F2015-07-091-1/+1
|\
| * Merge branch 'fix-premature-eof' of https://github.com/a-ba/docker-py into a-...Joffrey F2015-07-091-1/+1
| |\ |/ /
| * fix premature EOF detection in streamsAnthony Baire2015-06-291-1/+1
* | Back to dev versionJoffrey F2015-07-091-1/+1
* | Merge pull request #671 from docker/1.3.0-release1.3.0Joffrey F2015-07-094-17/+51
|\ \
| * | websocket-client for all versions1.3.0-releaseJoffrey F2015-07-081-3/+1
| * | Updated changelogJoffrey F2015-07-081-0/+49
| * | Bumped version to 1.3.0Joffrey F2015-07-081-1/+1
| * | Removed execute() methodJoffrey F2015-07-081-13/+0
|/ /
* | Added missing `Client.load_image` docsJoffrey F2015-07-081-3/+15
* | Merge pull request #669 from dano/fix-tty-streams2Joffrey F2015-07-084-49/+87
|\ \
| * | Fix handling output from tty-enabled containers.Dan O'Reilly2015-07-064-49/+87
|/ /
* | Merge pull request #666 from Slix/patch-1Maxime Petazzoni2015-07-021-1/+1
|\ \
| * | Fix missing apostrophes in docsPeter Kowalczyk2015-07-021-1/+1
|/ /
* | Merge pull request #652 from docker/clientbase_extractionMaxime Petazzoni2015-07-012-227/+240
|\ \
| * | ClientBase class to extract utility methods and constructor and sanitize Clie...clientbase_extractionJoffrey F2015-07-013-227/+241
| * | Fix adapter bug + regression testJoffrey F2015-07-011-1/+0
|/ /
* | Merge pull request #651 from docker/fix_647Joffrey F2015-06-302-5/+19
|\ \
| * | Fix Unix socket adapter bug with double slash in path + regression testfix_647Joffrey F2015-06-302-5/+19
* | | Merge pull request #644 from docker/memory-memswap-hostconfigJoffrey F2015-06-303-63/+91
|\ \ \ | |/ / |/| |
| * | Updated tests for mem_limit changesmemory-memswap-hostconfigJoffrey F2015-06-191-53/+56
| * | Moved mem_limit and memswap_limit to host_config for API version >= 1.19Joffrey F2015-06-192-10/+35
* | | Merge pull request #661 from docker/fix_640Maxime Petazzoni2015-06-301-1/+1
|\ \ \
| * | | Added git@ as a valid prefix for remote build pathsfix_640Joffrey F2015-06-301-1/+1
View Lorry Controller Status