summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Run dockerignore integration test with nocache enabled712-dockerignore-test-cacheJoffrey F2015-08-251-1/+1
* Merge pull request #735 from aanand/test-network-mode-versionJoffrey F2015-08-252-5/+12
|\
| * Prevent users from attempting to override 'version'Aanand Prasad2015-08-251-0/+5
| * Explicitly test NetworkMode logic in create_host_configAanand Prasad2015-08-251-5/+7
* | Merge pull request #736 from aanand/propagate-exceptions-in-testsJoffrey F2015-08-251-661/+347
|\ \
| * | Stop catching Exception in tests where it isn't expectedAanand Prasad2015-08-251-661/+347
| |/
* | Merge pull request #738 from bboreham/fix-deprecated-callJoffrey F2015-08-251-12/+12
|\ \ | |/ |/|
| * Call Client.create_host_config because the old call is deprecatedBryan Boreham2015-08-251-12/+12
|/
* Merge pull request #732 from docker/version-dependent-hostconfigAanand Prasad2015-08-256-58/+90
|\
| * Update HostConfig docsJoffrey F2015-08-242-4/+5
| * Adapt tests to new create_host_config usageJoffrey F2015-08-242-49/+63
| * Add version param to utils.create_host_configJoffrey F2015-08-242-5/+22
* | Merge pull request #733 from ColinHuang/docMaxime Petazzoni2015-08-251-0/+10
|\ \
| * | Add resize API in docColin Huang2015-08-251-0/+10
| |/
* | Merge pull request #734 from ColinHuang/masterMaxime Petazzoni2015-08-252-2/+5
|\ \ | |/ |/|
| * Split the entrypoint string to shell-like syntax.Colin Huang2015-08-252-2/+5
|/
* Merge branch 'mohitsoni-master'Joffrey F2015-08-242-1/+22
|\
| * Added support for cgroup parentMohit Soni2015-08-242-1/+22
|/
* Merge pull request #711 from ClusterHQ/exec_inspect_versionJoffrey F2015-08-241-2/+4
|\
| * Update error message to state that exec_inspect is not supportedBridget McErlean2015-08-121-1/+3
| * Change minimum API version for exec_inspectBridget McErlean2015-08-121-2/+2
* | Merge pull request #728 from aanand/debug-authJoffrey F2015-08-242-6/+49
|\ \
| * | Add logging for auth loading/resolutionAanand Prasad2015-08-202-6/+49
* | | Merge pull request #727 from mark-adams/fixes-726Joffrey F2015-08-202-6/+22
|\ \ \ | |/ / |/| |
| * | Fixed #726 issue where split_port was checking `len(None)`Mark Adams2015-08-192-6/+22
|/ /
* | Merge pull request #724 from bedwards/bedwards-fluentd-patchJoffrey F2015-08-181-1/+3
|\ \
| * | add gelf and fluentd logging drivers to types.pyBrian Edwards2015-08-181-1/+3
|/ /
* | Merge pull request #719 from docker/allow-path-in-hostAanand Prasad2015-08-182-3/+11
|\ \ | |/ |/|
| * 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
|/ /