summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Mock read_from_socket methoddgageot-fix-1123Joffrey F2016-07-081-1/+6
* Read from socket after sending TCP upgrade headers.Joffrey F2016-07-084-9/+66
* Add hijack hints for non-detached exec api callsDavid Gageot2016-07-082-3/+39
* Add hijack hints for attach api callsDavid Gageot2016-07-081-2/+8
* Merge pull request #1109 from docker/signal-strAanand Prasad2016-06-283-7/+42
|\
| * Add integration tests for different types of kill signalsJoffrey F2016-06-281-0/+30
| * Fix network aliases test with Engine 1.12signal-strJoffrey F2016-06-281-6/+9
| * signal in Client.kill can be a string containing the signal's nameJoffrey F2016-06-281-1/+3
|/
* Merge pull request #1108 from docker/1107-link-local-ipsJoffrey F2016-06-274-3/+23
|\
| * Add support for link-local IPs in endpoint config1107-link-local-ipsJoffrey F2016-06-244-3/+23
|/
* Merge pull request #1096 from docker/1.9.0-release1.9.0-rc1Joffrey F2016-06-162-2/+24
|\
| * 1.9.0 RC1Joffrey F2016-06-162-2/+24
|/
* Merge pull request #1066 from yunzhu-li/blkio-controlJoffrey F2016-06-153-2/+85
|\
| * Add support for Block IO constraints in HostConfigyunzhu-li2016-06-053-2/+85
* | Merge pull request #1079 from docker/1024-npipe-supportJoffrey F2016-06-1411-14/+322
|\ \
| * | Remove obsolete, commented out code1024-npipe-supportJoffrey F2016-06-081-3/+0
| * | Update parse_host and testsJoffrey F2016-06-023-8/+8
| * | Reorganize docker.transport packageJoffrey F2016-06-026-3/+4
| * | npipe support cleanupJoffrey F2016-06-029-45/+16
| * | pypiwin32 added to requirementsJoffrey F2016-06-022-0/+8
| * | Experimental npipe:// supportJoffrey F2016-06-027-1/+332
| |/
* | Merge pull request #1083 from docker/1042-ip-networking-configJoffrey F2016-06-135-31/+237
|\ \
| * | Expand on the 1-network limit in create_container1042-ip-networking-configJoffrey F2016-06-131-2/+5
| * | Unify endpoint config creation when using connect_container_to_networkJoffrey F2016-06-132-22/+10
| * | Add ipv[46]_address params to create_endpoint_config.Joffrey F2016-06-134-11/+226
* | | Merge pull request #1090 from docker/1080-inspect-image-docsJoffrey F2016-06-131-1/+1
|\ \ \ | |/ / |/| |
| * | 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