cd8273e40c
Merge pull request #17127 from gesellix/docs-filters-query
...
docs: fix description of `filters` param for /volumes and /networks.
Upstream-commit: 8005dbd748103357949e6ece5cad35fcb3f15018
Component: engine
2015-10-19 09:49:37 -04:00
4a486cfe36
Merge pull request #17155 from janten/meitner
...
Correct Lise Meitner's name, add Euler and Noether
Upstream-commit: 8eba018b610e425960ffb4620dd7a0bfde5238d9
Component: engine
2015-10-19 08:26:55 -04:00
9688b9f21e
Merge pull request #17166 from echo33/docker_cli_diff_test
...
use of checkers on docker_cli_diff_test.go
Upstream-commit: 1f9557ac66740fa4c722f0d80e2d8e00b0ca6b5f
Component: engine
2015-10-19 08:25:32 -04:00
eb8940de3d
Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go
...
Use of checkers on docker_cli_inspect_experimental_test.go
Upstream-commit: 1c783567c06e52288bbff73168ee3596e2d357e7
Component: engine
2015-10-19 08:21:17 -04:00
07d916aab1
Use of checkers on docker_cli_inspect_experimental_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: f3b2b8700f63654ff5c361dedfcf539eb6ee9ef6
Component: engine
2015-10-19 19:44:04 +08:00
0b8125559d
use of checkers on docker_cli_diff_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: 7be79767c18a1643e9e8e9be1764f2c838152c0b
Component: engine
2015-10-19 19:07:59 +08:00
8f92947edf
Merge pull request #16897 from sunyuan3/docker_cli_rm_test
...
use of checkers on docker_cli_rm_test.go
Upstream-commit: eaa1fc41c6cbdf589831d607e86e0ee38c2d053f
Component: engine
2015-10-19 09:14:23 +02:00
a835b763db
Merge pull request #17162 from echo33/docker_cli_exec_unix_test
...
use of checkers on docker_cli_exec_unix_test.go
Upstream-commit: cfdb954303d031b85847483765b2ca98fc8d3f79
Component: engine
2015-10-19 08:54:42 +02:00
e8502d163c
use of checkers on docker_cli_exec_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com >
Upstream-commit: d65ac42ca8ca368e0e6dc5ec9a26f8ec13b98ef4
Component: engine
2015-10-19 15:14:59 +08:00
91f3592865
use of checkers on docker_cli_rm_test.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 0780ddc498f093cec67edd358e00add82c5efd5a
Component: engine
2015-10-19 10:42:56 +08:00
4910236f92
Fix spelling error, add Noether and Euler
...
Signed-off-by: Jan-Gerd Tenberge <janten@gmail.com >
Upstream-commit: ab31d9500ebe0c3bf039321bb8c83c7b01c21e4e
Component: engine
2015-10-19 01:14:39 +02:00
94c05d87ae
Update fedora doc
...
`service` is deprecated from Fedora v21.
It's important to enable and start the `docker` daemon using `systemctl`.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 6a648659915ad2be4b1e5841594279020821bec1
Component: engine
2015-10-18 23:00:23 +03:00
a455baadf1
Merge pull request #17008 from liaoqingwei/dev1
...
Update testcases: use of checkers on docker_cli_nat_test.go
Upstream-commit: bece5b82a89081816bc622d3c3e9178251013636
Component: engine
2015-10-18 18:11:02 +02:00
f9537ab059
Use of checkers on docker_cli_nat_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 26ae6d6b36a40a42706e149a6d1c30c27b5b3355
Component: engine
2015-10-18 20:02:55 +08:00
650f9b7712
docs: fix storage driver options list
...
This fixes the indentation of the storage driver
options list.
Also wraps/reformats some examples to prevent
horizontal scrollbars on the rendered HTML
Fixes #17140
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8f36ded5b13b896d493645b845a24f4129b3a5de
Component: engine
2015-10-17 19:17:07 -07:00
c8c1f0d5cb
Merge pull request #16960 from pydima/9283_consider_hard_links_in_image_size
...
Consider hardlinks in image size.
Upstream-commit: 2726434f72d377aea5afe9c184e9a1e5d2387c6d
Component: engine
2015-10-17 14:22:33 -04:00
c93afd4f9e
Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build
...
Vendoring new go-check checkers and use checker for docker_api_build_test.go
Upstream-commit: cffd50752c2b2243519193a4ca458156291eb8af
Component: engine
2015-10-17 08:50:51 -07:00
0c3c684555
Use checker assert for docker_api_build_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 253f975fdbc13bc8a84fba1a3f8a4e518cb86d8e
Component: engine
2015-10-17 14:28:13 +02:00
e7f314a486
Vendoring shakers library and update go-check
...
The shakers library defines a bunch of go-check checkers to ease
writing tests.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9685b4767fc49c4a43ba762a5afbcd175f3d9245
Component: engine
2015-10-17 14:28:08 +02:00
17e4fec1fd
Merge pull request #16871 from ZJU-SEL/fix_version_test
...
update docker_cli_version_test.go
Upstream-commit: 9b1fb0d45b09f72e368e4f5d025ea592ee002007
Component: engine
2015-10-17 08:02:18 -04:00
23d31806c6
Fixes #9283 . Consider hardlinks in image size.
...
Based on #8984 . This patch fixes behavior when image size calculation
didn't consider hardlinks.
Signed-off-by: Dmitry Vorobev <dimahabr@gmail.com >
Upstream-commit: 4102537cfd305e37ef3ebfc291bd8521138c0e6c
Component: engine
2015-10-17 12:24:05 +02:00
efafa4e0c7
Merge pull request #17119 from vdemeester/17117-deprecate-c-cli-opts
...
Deprecate -c cli short variant flag in docker cli build & create
Upstream-commit: ab1f03397ed48440454332598fa707afa9187b42
Component: engine
2015-10-17 10:22:46 +02:00
dabf81be3c
Merge pull request #16831 from jfrazelle/release-updates
...
Release updates
Upstream-commit: e3fabf3ea1548afa3d147eb6f41b8656a70569b7
Component: engine
2015-10-16 16:57:10 -07:00
2c49af742a
Merge pull request #17113 from mountkin/validate-filter
...
make sure the value of the dangling filter is correct
Upstream-commit: c3f42b29a805e41a1e518653a1855c4e2a7f8d43
Component: engine
2015-10-16 16:32:11 -07:00
ce075943c3
docs: fix description of filters param for /volumes and /networks.
...
fixes #17091
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 3e064371e7ddec0de4dd2af75d5ac227b1080d53
Component: engine
2015-10-17 00:24:40 +02:00
f246159061
Merge pull request #17046 from mavenugo/dopts
...
driver-opts for network create
Upstream-commit: 365a0db0f0f105306a8553405fb68a207e8d7754
Component: engine
2015-10-16 15:23:59 -07:00
a13a9840ca
Merge pull request #16901 from WeiZhang555/rmi-inte
...
Update integration test `integration-cli/docker_cli_rmi_test.go` with Assert
Upstream-commit: ec7c368ff01e2e79cb26a5afa2d2c7291cc1472d
Component: engine
2015-10-16 15:23:00 -07:00
08f3a405bd
Merge pull request #16977 from mountkin/refactor-test
...
refactor integration test to use checkers
Upstream-commit: d8b4471a593f55a06ec77e6b3e8215a20b3f0f5f
Component: engine
2015-10-17 00:22:03 +02:00
96e54d6d90
Merge pull request #16950 from cpuguy83/support_ipv6_in_host_parser
...
Allow API to bind to ipv6 addresses
Upstream-commit: 4fc97e40c971d712cb76d1f782ee221432b4ede2
Component: engine
2015-10-17 00:20:49 +02:00
fb40faa2f7
Merge pull request #16994 from Microsoft/10662-copied
...
Windows: Fix annoying bad log
Upstream-commit: 8c1fa7f32028c7c2a631317b7b3112ca9a78cd19
Component: engine
2015-10-16 15:14:08 -07:00
b8701b18c6
Merge pull request #17051 from thaJeztah/fix-volume-readonly-doc
...
remove incorrect "readonly" example
Upstream-commit: 475be776b877c787c7e679cfb0a60b888823ed86
Component: engine
2015-10-16 15:11:48 -07:00
943431b7fa
Deprecate -c cli short variant flag in docker cli
...
- build
- create
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d1064bd441612244d7a560c6ceb3704ad12b23a6
Component: engine
2015-10-17 00:05:34 +02:00
56234a9ec7
Merge pull request #17065 from ZJaffee/api-exec-resize-test
...
cleaned up integration-cli/docker_api_exec_resize_test.go
Upstream-commit: 258357857bc0bc184370e50cba6d20d5ec373666
Component: engine
2015-10-16 14:59:06 -07:00
146e9ba09f
Merge pull request #16574 from Djelibeybi/rpm-changelog
...
Generate a full RPM changelog from the existing CHANGELOG.md file
Upstream-commit: 3668be932e0b3fccd3cde0cff20192c123227a98
Component: engine
2015-10-16 14:55:39 -07:00
08be0c3eb3
Pass network driver option in docker network command
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6f3eb994b52dac9e336db9fe9f204e120553e8a7
Component: engine
2015-10-16 14:33:54 -07:00
b9ef35ce38
Vendoring libnetwork to Replace the label variable to DriverOpts
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: cf1b5fe6011e49d19e2b27792d6f28fd6cd8984e
Component: engine
2015-10-16 14:30:57 -07:00
8703001b4e
Merge pull request #17106 from albers/completion-import
...
Add missing options to bash completion for `docker import`
Upstream-commit: e23d834a01e76cafbc473b317331df88e62c1807
Component: engine
2015-10-16 14:28:14 -07:00
d7b2ac8e95
Merge pull request #17107 from albers/completion-build
...
Add missing options to bash completion for `docker build`
Upstream-commit: b1bab9e1e70dd05b3a5a7296d7cd8c426bb52488
Component: engine
2015-10-16 14:27:51 -07:00
60b4592b43
Merge pull request #17081 from ZJaffee/api_network_test
...
Cleaned up integration-cli/docker_api_network_test.go
Upstream-commit: c56b02b284b6f5b1d59750a5fd087601d8919ecb
Component: engine
2015-10-16 23:14:17 +02:00
e3e432fcdd
Merge pull request #17121 from sdurrheimer/zsh-completion-fix-double-dash-option-arguments
...
Zsh : all --<option>= flag values may be given in the next argument
Upstream-commit: 8b90aefd14867748c0c7991bb9fe781b08546f44
Component: engine
2015-10-16 23:13:25 +02:00
2c094cc2e5
Merge pull request #16969 from zhangjianfnst/16756-improve-integration-cli
...
Use c.Assert in integration-cli/docker_cli_logs_test.go
Upstream-commit: 84be89a273742b24bb9a87ea5ccfecac97d33bfc
Component: engine
2015-10-16 16:55:44 -04:00
7b324dba2d
Zsh completion : all --<option>= flag values may be given in the next argument
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b34aa69e8f11ad03b2dffc5ed77ca93a9f32674c
Component: engine
2015-10-16 21:18:27 +02:00
40fe606d4e
Merge pull request #17098 from sdurrheimer/zsh-completion-import-message
...
Add zsh completion for 'docker import -m --message'
Upstream-commit: ccf5b60c6f291da16d3857ac9bfddb1d8407e7be
Component: engine
2015-10-16 11:36:46 -07:00
5ce5e6c4db
Merge pull request #17093 from endophage/update_notary_gotuf
...
updating notary and gotuf with latest bugfixes
Upstream-commit: b054a88af1d4c7c01d1fd4ee0fa3fe67b8bf07d0
Component: engine
2015-10-16 11:19:21 -07:00
58fe4023e8
cleaned up integration-cli/docker_api_exec_resize_test.go
...
Signed-off-by: Zachary Jaffee <zij@case.edu >
Upstream-commit: 7b6bca5af1b8eb4f6fc99db6670a9f528284cb20
Component: engine
2015-10-16 13:22:40 -04:00
a120d9f127
Merge pull request #17085 from dnephin/add_digest_to_api_docs
...
Correct API docs for /images/create
Upstream-commit: e2870bda43aef2e7649bf811b451d765ed16b4c4
Component: engine
2015-10-16 10:10:41 -07:00
6bb352bab1
Merge pull request #17100 from WeiZhang555/port-inte
...
update docker_cli_port_test.go with Assert
Upstream-commit: 2afdab4454679650669b3bb70321568d25de9dd8
Component: engine
2015-10-16 19:06:14 +02:00
98ece668a9
updating notary and gotuf with latest bugfixes
...
Signed-off-by: David Lawrence <david.lawrence@docker.com >
Upstream-commit: 7ce9f0275130b66241f9077485d14e25c641cc3d
Component: engine
2015-10-16 09:33:26 -07:00
97bcb30984
Merge pull request #17062 from coolljt0725/fix_cancel
...
Fix cancel build doesn't remove the intermediate container
Upstream-commit: 841205ec012f42a8cad0be7a91c830a91d107ce6
Component: engine
2015-10-16 09:06:09 -07:00
6d17273149
Merge pull request #17101 from sdurrheimer/zsh-completion-deprecate-run-dash-c-option
...
Deprecate 'docker run -c' option in zsh completion
Upstream-commit: 08a43b8b3b68273fcc84cd7f04419a103dcad76a
Component: engine
2015-10-16 11:40:02 -04:00
