summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update default API version to 1.22default-version-1.22Joffrey F2016-03-163-27/+35
* Merge pull request #988 from docker/tls-fixesJoffrey F2016-03-152-17/+5
|\
| * Merge branch 'master' into tls-fixestls-fixesJoffrey F2016-03-151-6/+5
| |\ | |/ |/|
* | Merge pull request #990 from docker/docker-21153Joffrey F2016-03-141-6/+5
|\ \
| * | Invalid log driver error raised during create_container stepdocker-21153Joffrey F2016-03-141-6/+5
|/ /
| * Fix enable_tls issue #984Joffrey F2016-03-112-17/+5
|/
* Merge branch 'mdaue-935'Joffrey F2016-03-092-0/+66
|\
| * Merge branch '935' of https://github.com/mdaue/docker-py into mdaue-935Joffrey F2016-03-092-0/+66
| |\ |/ /
| * Add ip4&ip6 (#935) support, network/id/connectMatt Daue2016-03-022-0/+66
* | Merge pull request #977 from TomasTomecek/put-test-data-to-distJoffrey F2016-03-081-0/+1
|\ \
| * | include unit test data in dist tarballTomas Tomecek2016-03-081-0/+1
|/ /
* | Merge pull request #971 from docker/963-tlsv1-defaultJoffrey F2016-03-031-1/+6
|\ \ | |/ |/|
| * Use protocol TLS v1.0 by default when none is set.963-tlsv1-defaultJoffrey F2016-03-021-1/+6
|/
* Merge pull request #970 from marshyski/masterAanand Prasad2016-03-021-1/+1
|\
| * Updated stat networks print output Signed-off-by: Tim Marcinowski <marshyski@...Tim Ski2016-03-021-1/+1
|/
* Merge pull request #968 from atopuzov/decode_on_push_and_pullJoffrey F2016-03-011-4/+4
|\
| * Use decode on push and pull operations.Aleksandar Topuzovic2016-03-011-4/+4
|/
* Merge pull request #916 from docker/container_update_featureJoffrey F2016-02-246-40/+132
|\
| * Improve parse_bytes util methodcontainer_update_featureJoffrey F2016-02-232-40/+36
| * update_container now supports string valuesJoffrey F2016-02-231-4/+5
| * Unit test for Client.update_container methodJoffrey F2016-02-232-0/+25
| * Documentation for Client.update_container methodJoffrey F2016-02-231-1/+21
| * New `update_container` methodJoffrey F2016-02-232-0/+50
* | Merge pull request #942 from seguins/934-separate-stream-follow-logsJoffrey F2016-02-244-8/+56
|\ \
| * | Separate params stream and follow for logs.Stéphane Seguin2016-02-164-8/+56
* | | Merge pull request #958 from dnephin/oops_fix_empty_env_vars_againDaniel Nephin2016-02-242-3/+6
|\ \ \
| * | | Fix env vars with empty values.Daniel Nephin2016-02-242-3/+6
|/ / /
* | | Merge pull request #952 from dnephin/fix_empty_env_varsJoffrey F2016-02-242-4/+19
|\ \ \
| * | | Format environment variables to match docker-cli.Daniel Nephin2016-02-232-4/+19
* | | | Merge pull request #954 from bfirsh/better-documentation-linkJoffrey F2016-02-241-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Improved descriptionBen Firshman2016-02-241-2/+2
| * | | Improved documentation link copyBen Firshman2016-02-241-2/+2
|/ / /
* | | Back to dev versionJoffrey F2016-02-231-1/+1
|/ /
* | Merge pull request #951 from docker/1.7.2-release1.7.2Joffrey F2016-02-232-1/+11
|\ \
| * | Prepare 1.7.2 release1.7.2-releaseJoffrey F2016-02-232-1/+11
|/ /
* | Merge pull request #950 from aanand/fix-tlsJoffrey F2016-02-233-6/+9
|\ \
| * | Fix TLS regressionsAanand Prasad2016-02-233-6/+9
|/ /
* | Back to dev versionJoffrey F2016-02-221-1/+1
* | Merge pull request #944 from docker/1.7.1-release1.7.1Joffrey F2016-02-222-1/+21
|\ \ | |/ |/|
| * 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
| |/