summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update outdated error message914_hostconfig_startJoffrey F2016-01-291-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #912 from docker/495_port_bindings_advanced_docAanand Prasad2016-01-291-0/+17
|\ | | | | Advanced documentation for port bindings
| * Advanced documentation for port bindings495_port_bindings_advanced_docJoffrey F2016-01-281-0/+17
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #911 from docker/894-docker_host_envDaniel Nephin2016-01-293-6/+11
|\ \ | |/ |/| Support unspecified protocol in base_url when using TLS
| * Support unspecified protocol in base_url when using TLS894-docker_host_envJoffrey F2016-01-283-6/+11
|/ | | | | | (assume HTTPS) Signed-off-by: Joffrey F <joffrey@docker.com>
* Bump RC1.7.0-rc3Joffrey F2016-01-261-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #906 from aanand/capture-stdout-stderrJoffrey F2016-01-251-1/+1
|\ | | | | Re-enable stdout/stderr capturing in tests
| * Re-enable stdout/stderr capturing in testsAanand Prasad2016-01-251-1/+1
| | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Merge pull request #907 from aanand/raise-for-status-connect-disconnectJoffrey F2016-01-252-2/+10
|\ \ | |/ |/| Raise exceptions for API errors on network connect/disconnect
| * Raise exceptions for API errors on network connect/disconnectAanand Prasad2016-01-252-2/+10
|/ | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Bumped RC1.7.0rc2Joffrey F2016-01-211-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #902 from docker/py32_deprecationAanand Prasad2016-01-213-3/+1
|\ | | | | Drop support for python 3.2
| * Drop support for python 3.2py32_deprecationJoffrey F2016-01-203-3/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #901 from aanand/networking-linksJoffrey F2016-01-206-10/+85
|\ | | | | Support links (container-local aliases) when creating containers or connecting to networks
| * Support links when creating containers or connecting to networksAanand Prasad2016-01-206-10/+85
|/ | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* 1.7.0 release candidate1.7.0-rc1rc_1.7.0Joffrey F2016-01-181-1/+1
| | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #880 from docker/813-parse-float-bytesJoffrey F2016-01-182-16/+38
|\ | | | | Handle 64-bit integer values in parse_bytes
| * parse_bytes: Add ability to handle 64-bit integers in py2Joffrey F2016-01-182-16/+38
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #899 from docker/http-headers-supportJoffrey F2016-01-185-5/+49
|\ \ | |/ |/| Add HttpHeaders support
| * Add HttpHeaders support in load_configPavel Kravchenko2016-01-185-5/+49
|/ | | | Signed-off-by: Pavel Kravchenko <kpavel@il.ibm.com>
* Merge pull request #889 from docker/725-devices-formatAanand Prasad2016-01-185-20/+94
|\ | | | | Improve host devices support
| * Improve host devices supportJoffrey F2016-01-185-20/+94
|/ | | | | | | | Add unit tests for utils.parse_devices Rewrite documentation Support dict and string format for device declaration Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #898 from docker/https_docs_linkJoffrey F2016-01-182-3/+3
|\ | | | | Update HTTPS docs link
| * Update HTTPS docs linkhttps_docs_linkJoffrey F2016-01-182-3/+3
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #897 from aanand/network-optionsAanand Prasad2016-01-185-27/+68
|\ \ | |/ |/| Normalise/fix networking API JSON keys
| * Normalise/fix networking API JSON keysAanand Prasad2016-01-185-27/+68
|/ | | | | | | - Use CamelCase - `auxaddresses` -> `AuxiliaryAddresses` Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #895 from aanand/aliasAanand Prasad2016-01-148-10/+136
|\ | | | | Implement support for network-scoped aliases
| * Implement support for network-scoped aliasesAanand Prasad2016-01-148-10/+136
|/ | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* Merge pull request #892 from docker/base_url_noneDaniel Nephin2016-01-111-1/+1
|\ | | | | Don't break if base_url == None and TLS is enabled
| * Don't break if base_url == None and TLS is enabledbase_url_noneJoffrey F2016-01-081-1/+1
|/ | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* Merge pull request #818 from rmb938/patch-1Aanand Prasad2016-01-057-4/+83
|\ | | | | allow custom ipam options when creating networks
| * allow custom ipam options when creating networksRyan Belgrave2016-01-047-4/+83
| | | | | | | | Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
* | Merge pull request #888 from wenchma/18626-sync_inspect_networkJoffrey F2016-01-041-9/+5
|\ \ | |/ |/| Update the test_inspect_network
| * Update docker network inspect testwenchma2015-12-301-9/+5
| | | | | | | | | | | | | | | | This is based on https://github.com/docker/docker/pull/18928 Related to docker/docker#18626 Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
* | Merge pull request #882 from docker/881-hostconfig_docJoffrey F2016-01-041-0/+2
|\ \ | |/ |/| Add cpu_quota and cpu_period to the HostConfig documentation
| * Add cpu_quota and cpu_period to the HostConfig documentation881-hostconfig_docJoffrey F2015-12-221-0/+2
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #884 from docker/stop_test_updateJoffrey F2015-12-231-6/+0
|\ \ | | | | | | Don't expect non-zero exit code when stopping a container
| * | Don't expect non-zero exit code when stopping a containerstop_test_updateJoffrey F2015-12-231-6/+0
|/ / | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #883 from joshpurvis/jp-since-docsDaniel Nephin2015-12-231-0/+1
|\ \ | |/ |/| Add docs for since argument in container logs method
| * Add docs for argument when retrieving container logsJosh Purvis2015-12-231-0/+1
|/ | | | Signed-off-by: Josh Purvis <jpurvis@kwantera.com>
* Merge pull request #863 from thomasboyt/fast-exclude-pathsAanand Prasad2015-12-163-27/+62
|\ | | | | Don't descend into ignored directories when building context
| * Improve get_paths performance by not descending into ignored directoriesThomas Boyt2015-12-083-27/+62
| | | | | | | | Signed-off-by: Thomas Boyt <thomas@ledgerx.com>
* | Merge pull request #874 from aanand/fix-index.docker.ioAanand Prasad2015-12-163-47/+91
|\ \ | | | | | | Treat 'index.docker.io' repo names as 'docker.io'
| * | Treat 'index.docker.io' repo names as 'docker.io'Aanand Prasad2015-12-102-8/+38
| | | | | | | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Refactor resolve_authconfig testsAanand Prasad2015-12-102-38/+52
| | | | | | | | | | | | | | | | | | | | | The structure of the fake config dictionary was not reflective of what actual parsed config looks like. Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| * | Allow overriding of positional args to py.test in tox.iniAanand Prasad2015-12-101-1/+1
|/ / | | | | | | Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
* | Bumped versionJoffrey F2015-12-091-1/+1
| | | | | | | | Signed-off-by: Joffrey F <joffrey@docker.com>
* | Merge pull request #871 from thaJeztah/update-maintainersJoffrey F2015-12-091-5/+52
|\ \ | | | | | | update maintainers file for parsing
| * | update maintainers file for parsingSebastiaan van Stijn2015-12-091-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | this updates the MAINTAINERS file to the new format, so that it can be parsed and collected in the docker/opensource repository. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | Merge pull request #867 from sumitsahrawat/network-create-optionsAanand Prasad2015-12-096-10/+76
|\ \ \ | |/ / |/| | Allow providing options when creating networks
View Lorry Controller Status