summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update changelog for 1.7.11.7.1-releaseJoffrey F2016-02-171-0/+20
* Bumped version to 1.7.1Joffrey F2016-02-171-1/+1
* Merge pull request #928 from docker/926-ignored_dockerfilesJoffrey F2016-02-092-6/+24
|\
| * Never exclude Dockerfile from the build context.926-ignored_dockerfilesJoffrey F2016-02-092-6/+24
* | Merge pull request #929 from docker/927-config-parsingJoffrey F2016-02-092-4/+48
|\ \ | |/ |/|
| * Don't break when parsing unknown config keys927-config-parsingJoffrey F2016-02-092-4/+48
|/
* Merge branch 'keloyang-VolumeBind'Joffrey F2016-02-081-2/+0
|\
| * Merge branch 'VolumeBind' of https://github.com/keloyang/docker-py into keloy...Joffrey F2016-02-081-2/+0
| |\ |/ /
| * create tempfile in VolumeBindTest for non-auto-creating of dockeryangshukui2016-02-041-0/+1
* | Merge pull request #920 from docker/ssl_version_simplerJoffrey F2016-02-053-17/+18
|\ \
| * | Remove obsolete SSL version computationssl_version_simplerJoffrey F2016-02-033-17/+18
| |/
* | Merge pull request #924 from mikedougherty/tls-verify-falseJoffrey F2016-02-043-33/+91
|\ \
| * | Re-write kwargs_from_env to handle TLS options betterMike Dougherty2016-02-043-33/+91
|/ /
* | Merge pull request #923 from nubs/masterJoffrey F2016-02-043-1/+17
|\ \
| * | Add support for shm_size.Spencer Rinehart2016-02-043-1/+17
* | | Back to dev versionJoffrey F2016-02-041-1/+1
|/ /
* | Merge pull request #922 from docker/release-1.7.01.7.0Joffrey F2016-02-042-1/+34
|\ \ | |/ |/|
| * Bump to stable versionrelease-1.7.0Joffrey F2016-02-042-1/+34
|/
* Merge pull request #915 from docker/914_hostconfig_startJoffrey F2016-02-011-1/+1
|\
| * Update outdated error message914_hostconfig_startJoffrey F2016-01-291-1/+1
|/
* Merge pull request #912 from docker/495_port_bindings_advanced_docAanand Prasad2016-01-291-0/+17
|\
| * Advanced documentation for port bindings495_port_bindings_advanced_docJoffrey F2016-01-281-0/+17
* | Merge pull request #911 from docker/894-docker_host_envDaniel Nephin2016-01-293-6/+11
|\ \ | |/ |/|
| * Support unspecified protocol in base_url when using TLS894-docker_host_envJoffrey F2016-01-283-6/+11
|/
* Bump RC1.7.0-rc3Joffrey F2016-01-261-1/+1
* Merge pull request #906 from aanand/capture-stdout-stderrJoffrey F2016-01-251-1/+1
|\
| * Re-enable stdout/stderr capturing in testsAanand Prasad2016-01-251-1/+1
* | Merge pull request #907 from aanand/raise-for-status-connect-disconnectJoffrey F2016-01-252-2/+10
|\ \ | |/ |/|
| * Raise exceptions for API errors on network connect/disconnectAanand Prasad2016-01-252-2/+10
|/
* Bumped RC1.7.0rc2Joffrey F2016-01-211-1/+1
* Merge pull request #902 from docker/py32_deprecationAanand Prasad2016-01-213-3/+1
|\
| * Drop support for python 3.2py32_deprecationJoffrey F2016-01-203-3/+1
|/
* Merge pull request #901 from aanand/networking-linksJoffrey F2016-01-206-10/+85
|\
| * Support links when creating containers or connecting to networksAanand Prasad2016-01-206-10/+85
|/
* 1.7.0 release candidate1.7.0-rc1rc_1.7.0Joffrey F2016-01-181-1/+1
* Merge pull request #880 from docker/813-parse-float-bytesJoffrey F2016-01-182-16/+38
|\
| * parse_bytes: Add ability to handle 64-bit integers in py2Joffrey F2016-01-182-16/+38
* | Merge pull request #899 from docker/http-headers-supportJoffrey F2016-01-185-5/+49
|\ \ | |/ |/|
| * Add HttpHeaders support in load_configPavel Kravchenko2016-01-185-5/+49
|/
* Merge pull request #889 from docker/725-devices-formatAanand Prasad2016-01-185-20/+94
|\
| * Improve host devices supportJoffrey F2016-01-185-20/+94
|/
* Merge pull request #898 from docker/https_docs_linkJoffrey F2016-01-182-3/+3
|\
| * Update HTTPS docs linkhttps_docs_linkJoffrey F2016-01-182-3/+3
* | Merge pull request #897 from aanand/network-optionsAanand Prasad2016-01-185-27/+68
|\ \ | |/ |/|
| * Normalise/fix networking API JSON keysAanand Prasad2016-01-185-27/+68
|/
* Merge pull request #895 from aanand/aliasAanand Prasad2016-01-148-10/+136
|\
| * Implement support for network-scoped aliasesAanand Prasad2016-01-148-10/+136
|/
* Merge pull request #892 from docker/base_url_noneDaniel Nephin2016-01-111-1/+1
|\
| * Don't break if base_url == None and TLS is enabledbase_url_noneJoffrey F2016-01-081-1/+1
|/
* Merge pull request #818 from rmb938/patch-1Aanand Prasad2016-01-057-4/+83
|\
View Lorry Controller Status