summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix param name for inspect_image in API docs1080-inspect-image-docsJoffrey F2016-06-091-1/+1
* Merge pull request #1084 from adamchainz/readthedocs.ioJoffrey F2016-06-084-5/+5
|\
| * Convert readthedocs links for their .org -> .io migration for hosted projectsAdam Chainz2016-06-084-5/+5
|/
* Merge pull request #1071 from graingert/support-py35Daniel Nephin2016-05-2510-69/+36
|\
| * support new Py3.5 Enum signalsThomas Grainger2016-05-191-1/+1
| * update docs to py3.5Thomas Grainger2016-05-193-4/+4
| * support Python 3.5Thomas Grainger2016-05-196-64/+31
|/
* Merge pull request #1068 from jgiannuzzi/internal_networksJoffrey F2016-05-183-1/+21
|\
| * Add support for creating internal networksJonathan Giannuzzi2016-05-183-1/+21
|/
* Merge pull request #1065 from aanand/fix-dockerignore-path-traversalJoffrey F2016-05-162-0/+11
|\
| * Resolve path traversal in .dockerignore patternsAanand Prasad2016-05-162-0/+11
|/
* Merge pull request #1057 from kevinfrommelt/socket-timeoutJoffrey F2016-05-102-6/+65
|\
| * Don't set socket timeout if it's already disabled when streamingKevin Frommelt2016-05-102-6/+65
|/
* Merge pull request #1051 from docker/1.8.1-release1.8.1Joffrey F2016-04-292-1/+16
|\
| * Update ChangeLog and version.py (1.8.1)1.8.1-releaseJoffrey F2016-04-282-1/+16
|/
* Merge pull request #1050 from docker/1044-fix-login-defaultJoffrey F2016-04-281-3/+1
|\
| * Let server-side determine which serveraddress to use when none is specified1044-fix-login-defaultJoffrey F2016-04-281-3/+1
* | Merge pull request #1004 from klj613/allow-equals-character-in-env-fileJoffrey F2016-04-272-1/+9
|\ \ | |/ |/|
| * makes it possible to have '=' in the env fileKristian Lewis Jones2016-03-222-1/+9
* | Removed obsolete env var in integration-dind target commandJoffrey F2016-04-261-1/+1
* | Add -dev suffix to versionJoffrey F2016-04-221-1/+1
* | Merge pull request #1039 from docker/felixonmars-backportsJoffrey F2016-04-215-137/+14
|\ \
| * | Only install ipaddress if python version < 3.3felixonmars-backportsJoffrey F2016-04-192-3/+2
| * | Require ipaddress on Python < 3.5Felix Yan2016-04-082-1/+3
| * | Use backports.ssl_match_hostnameFelix Yan2016-04-085-136/+12
* | | Merge pull request #1017 from SakuraSound/container-docsJoffrey F2016-04-201-0/+7
|\ \ \ | |/ / |/| |
| * | Added link to docker ps documentationJoir-dan Gumbs2016-04-191-0/+2
| * | rebased documentation changes against master forkJoir-dan Gumbs2016-04-186-12/+29
| |\ \ | |/ / |/| |
* | | Merge pull request #1025 from docker/1.8.0-release1.8.0Joffrey F2016-04-062-5/+8
|\ \ \
| * | | Bump version to 1.8.01.8.0-releaseJoffrey F2016-04-052-5/+8
|/ / /
* | | Merge pull request #1022 from docker/1021-empty-authJoffrey F2016-04-052-4/+16
|\ \ \
| * | | Don't raise InvalidConfigError when auth dict doesn't have an 'auth' keyJoffrey F2016-04-052-4/+16
|/ / /
* | | Merge pull request #1020 from mschnitzer/fix_little_errorJoffrey F2016-04-051-1/+1
|\ \ \
| * | | Remove not needed dot in README.mdManuel Schnitzer2016-04-051-1/+1
|/ / /
* | | Bump RC1.8.0-rc5Joffrey F2016-03-311-1/+1
* | | Merge pull request #1018 from aanand/fix-py2-ipaddress-dependencyJoffrey F2016-03-311-2/+4
|\ \ \
| * | | Fix py2-ipaddress dependencyAanand Prasad2016-03-311-2/+4
|/ / /
* | | Bump RC1.8.0-rc4Joffrey F2016-03-301-1/+1
| * | Bump RCJoffrey F2016-03-301-1/+1
| * | Added extra filtering options to containers command in ClientAPIJoir-dan Gumbs2016-03-301-0/+5
|/ /
* | Merge pull request #1015 from aanand/fix-port-binding-docJoffrey F2016-03-301-7/+9
|\ \
| * | Improve port binding docsAanand Prasad2016-03-301-7/+9
* | | Merge branch 'master' of github.com:docker/docker-pyJoffrey F2016-03-301-1/+1
|\ \ \
| * | | Bump RC1.8.0-rc3Joffrey F2016-03-301-1/+1
* | | | Use pip environment markers for conditional dependenciesJoffrey F2016-03-304-7/+3
|/ / /
* | | Merge pull request #1013 from docker/hostname_ip_matchingJoffrey F2016-03-3011-26/+231
|\ \ \ | |/ / |/| |
| * | Different requirements.txt in Dockerfile-py3hostname_ip_matchingJoffrey F2016-03-292-6/+6
| * | flake8 fixesJoffrey F2016-03-291-2/+4
| * | Tests for match_hostname backportJoffrey F2016-03-292-17/+73
| * | Add match_hostname implementation and monkey-patch for py<3.5Joffrey F2016-03-292-0/+139