summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump RC1.8.0-rc3Joffrey F2016-03-301-1/+1
* 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
| * Add py2-ipaddress dependency for python 2.xJoffrey F2016-03-294-1/+9
|/
* Merge pull request #1011 from tomleb/masterJoffrey F2016-03-241-1/+1
|\
| * Specify default value of stop's timeouttomleb2016-03-231-1/+1
|/
* Update release script. Bump to rc21.8.0-rc2Joffrey F2016-03-232-3/+2
* Merge pull request #1010 from docker/1.8.0rc11.8.0-rc1Joffrey F2016-03-233-1/+44
|\
| * Update ChangeLog1.8.0rc1Joffrey F2016-03-231-0/+42
| * Add README.rst to MANIFESTJoffrey F2016-03-231-0/+1
| * Set version to RC1Joffrey F2016-03-231-1/+1
|/
* Merge branch 'dimaspivak-master'Joffrey F2016-03-234-3/+20
|\
| * Test commit changes paramJoffrey F2016-03-231-0/+14
| * Merge branch 'master' of https://github.com/dimaspivak/docker-py into dimaspi...Joffrey F2016-03-233-3/+6
| |\ |/ /
| * Add support for changes param to ContainerApiMixin.commitDima Spivak2016-03-213-3/+6
* | Merge branch 'gferon-master'Joffrey F2016-03-232-1/+10
|\ \
| * | check_duplicate testJoffrey F2016-03-231-0/+7
| * | Merge branch 'master' of https://github.com/gferon/docker-py into gferon-masterJoffrey F2016-03-231-1/+3
| |\ \
| | * | Add missing CheckDuplicate parameter to /networks/create API callGabriel FĂ©ron2016-03-221-1/+3
* | | | Merge pull request #972 from vitalyisaev2/masterJoffrey F2016-03-231-4/+4
|\ \ \ \
| * | | | Fix UnixHTTPConnectionPool's superclass initializationVitaly Isaev2016-03-031-4/+4
* | | | | Merge pull request #1007 from docker/959-release-scriptJoffrey F2016-03-233-0/+38
|\ \ \ \ \
| * | | | | Basic release script959-release-scriptJoffrey F2016-03-223-0/+38
| | |/ / / | |/| | |
* | | | | Merge pull request #1008 from docker/speedplane-patch-1Joffrey F2016-03-233-4/+39
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | gzip build testspeedplane-patch-1Joffrey F2016-03-231-0/+28
| * | | | Make gzip encoding optionalJoffrey F2016-03-221-4/+9
| * | | | Fix line-spacing for buildMichael Sander2016-03-221-1/+2
| * | | | Encode the tar ball with gzipMichael Sander2016-03-221-1/+2
| * | | | Add an option to gzip tar files.Michael Sander2016-03-221-2/+2
|/ / / /
* | | | Merge branch 'bfirsh-from_env'Joffrey F2016-03-227-42/+64
|\ \ \ \
| * | | | Update mkdocs.yml to reference new Machine page.Joffrey F2016-03-223-4/+11
| * | | | Merge branch 'from_env' of https://github.com/bfirsh/docker-py into bfirsh-fr...Joffrey F2016-03-225-40/+55
| |\ \ \ \ |/ / / / /
| * | | | Add docker.from_env() shortcutBen Firshman2016-03-155-40/+55
* | | | | Merge pull request #1002 from adityamarella/masterJoffrey F2016-03-223-1/+22
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Support OomScoreAdj in host configurationAditya Marella2016-03-223-1/+22
|/ / / /
* | | | Merge pull request #1006 from docker/kwargs_from_env_altAanand Prasad2016-03-222-4/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Support passing an alternate environment dict to kwargs_from_envkwargs_from_env_altJoffrey F2016-03-212-4/+20
|/ / /
* | | Merge pull request #997 from wenchma/21080-net_linkDaniel Nephin2016-03-211-1/+1
|\ \ \
| * | | Remove the network mode to support linkable cantainers checkwenchma2016-03-211-1/+1
|/ / /
* | | Merge pull request #999 from docker/tcp-to-https-parsehostAanand Prasad2016-03-182-3/+9
|\ \ \
| * | | If tcp host is provided while TLS is enabled, convert to httpstcp-to-https-parsehostJoffrey F2016-03-172-3/+9
|/ / /
* | | Merge pull request #995 from docker/default-version-1.22Joffrey F2016-03-163-27/+35
|\ \ \
| * | | Update default API version to 1.22default-version-1.22Joffrey F2016-03-163-27/+35
| |/ /
* | | Merge pull request #994 from aanand/janLo-tmpfs-supportDaniel Nephin2016-03-166-1/+145
|\ \ \ | |/ / |/| |
| * | Add tmpfs doc to mkdocs.ymlAanand Prasad2016-03-161-0/+1
| * | Don't support tmpfs in API version < 1.22Aanand Prasad2016-03-162-0/+4
| * | Add tmpfs integration testAanand Prasad2016-03-161-0/+16