summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added full path parse_host unit testallow-path-in-hostJoffrey F2015-08-171-1/+4
* Allow docker host (base_url) to contain a pathJoffrey F2015-08-171-2/+7
* Merge pull request #698 from docker/jhowardmsft-14530-netmodeJoffrey F2015-08-104-21/+39
|\
| * Explicited start config tricksjhowardmsft-14530-netmodeJoffrey F2015-08-101-11/+13
| * Fixed empty_host_config testJoffrey F2015-07-291-1/+1
| * Moved network_mode default to create_host_config ; small fix to preserve blan...Joffrey F2015-07-292-11/+3
| * nit: parenthesis alignmentJoffrey F2015-07-291-6/+12
| * development version suffixJoffrey F2015-07-291-1/+1
| * Merge branch '14530-netmode' of https://github.com/jhowardmsft/docker-py into...Joffrey F2015-07-292-10/+28
| |\
| | * Add netmode (required by docker)John Howard2015-07-282-10/+28
* | | Merge pull request #702 from tshauck/bump-six-reqsMaxime Petazzoni2015-08-052-2/+2
|\ \ \
| * | | bump six req to >=1.4Trent Hauck2015-08-022-2/+2
| |/ /
* | | Merge pull request #703 from erikced/journald-log-driverAanand Prasad2015-08-051-1/+2
|\ \ \
| * | | Add journald log driver supportErik Cederberg2015-08-031-1/+2
| |/ /
* | | Merge branch 'vpetersson-master'Joffrey F2015-08-045-3/+84
|\ \ \
| * | | unpack key-value pairJoffrey F2015-08-041-2/+1
| * | | dev versionJoffrey F2015-08-041-1/+1
| * | | Squashed commit of the following:Viktor Petersson2015-07-304-2/+84
| |/ /
* | | Merge pull request #700 from saeta/patch-1Joffrey F2015-08-041-0/+2
|\ \ \ | |/ / |/| |
| * | Add documentation for mem_limit and memswap_limitBrennan Saeta2015-08-011-0/+2
|/ /
* | Merge pull request #696 from alexwlchan/masterJoffrey F2015-07-292-5/+5
|\ \
| * | Fix a few typos in the docsAlex Chan2015-07-292-5/+5
|/ /
* | 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
| |\ |/ /