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
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
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
e3c27b1293
Merge pull request #17099 from sdurrheimer/zsh-completion-restart-unless-stopped
...
Add zsh completion for 'unless-stopped' restart policy
Upstream-commit: 30b945fac958ccf1f9bbed45c2433c1ebcdf6f08
Component: engine
2015-10-16 11:37:27 -04:00
87dbf43805
Merge pull request #17105 from liaoqingwei/dev3
...
Use of checkers on docker_cli_pause_test.go.
Upstream-commit: 71982d8e576e659010426b94ba2c9fcfcb3e91c6
Component: engine
2015-10-16 17:36:56 +02:00
2f507073f8
Merge pull request #17102 from sdurrheimer/zsh-completion-build-build-arg
...
Add zsh completion for 'docker build --build-arg'
Upstream-commit: 579cf43f0fb266489da06ce93a5200cf53c9b37a
Component: engine
2015-10-16 08:34:12 -07:00
17fc3c7655
Merge pull request #17078 from kevinkucharczyk/api_version_test
...
Clean up integration-cli/docker_api_version_test.go
Upstream-commit: f9026e2b7b6431019f1a875e26174881f4275754
Component: engine
2015-10-16 08:26:53 -07:00
2f2d8462ab
update docker_cli_port_test.go with Assert
...
Part of #16756
Use c.Assert instead of condition judgement
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 1ae4eeb8136485e78b54de269c70a995fbaab9dd
Component: engine
2015-10-16 22:58:51 +08:00
9cdb750bf4
Merge pull request #17053 from liaoqingwei/dev2
...
use of checkers on docker_cli_network_unix_test.go
Upstream-commit: 835fbee9a23300569f95092c60fbc00eedddb6c5
Component: engine
2015-10-16 09:36:59 -04:00
e5c2b01462
Merge pull request #17112 from moxiegirl/fix-16961-tic
...
Removing extra tic
Upstream-commit: 60b5b0d380bbd7ee87e175395f1e4a6f487e8263
Component: engine
2015-10-16 09:10:12 -04:00
aa3a6d8798
bad d
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ee30af5ffb9b4db808c7e1e6db69c0c600e525c7
Component: engine
2015-10-16 06:09:03 -07:00
8cbac2fa0e
Removing extra tic
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e44876bf1fdb114a4730ef72f00e88c057abfb45
Component: engine
2015-10-16 06:07:52 -07:00
01a3690b02
Use of checkers on docker_cli_pause_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 851a533a823f1d158733e94afd4076c6a75f9706
Component: engine
2015-10-16 21:07:02 +08:00
97ebdafc04
Add missing options to bash completion for docker import
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b0315375f887600cc98c63b434e8d2401fc3d1d8
Component: engine
2015-10-16 12:42:12 +02:00
bb7266ff8d
bash completion: minor refactoring for consistency
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 3a713d91ce7d9edfe301e367f097d8cf370d2c52
Component: engine
2015-10-16 12:41:09 +02:00
c9f49c5202
Add missing options to bash completion for docker build
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 28c66b04911e98617be65bd4dce9cb9b9e134e4c
Component: engine
2015-10-16 12:40:55 +02:00
a02e30a7f6
Merge pull request #17087 from LK4D4/speedup_ps
...
Speedup container list
Upstream-commit: dee57e4c3ec8b86ffb2958528fc81f981f85f730
Component: engine
2015-10-16 12:35:28 +02:00
4dda269d8d
Fix cancel build doesn't remove the intermediate container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9392de9dfefc851139146161aa322e6c9e74cacf
Component: engine
2015-10-16 05:18:10 -04:00
2ebbc9e095
Use of checkers on docker_cli_network_unix_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: 9e3db08363fa85a08d7e6f9aa5059d19291c83c0
Component: engine
2015-10-16 16:56:40 +08:00
551d7de4db
Add zsh completion for 'docker import -m --message'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 96a09ea77cc4d8f80be4bd3e382688223e8c5c7e
Component: engine
2015-10-16 10:14:42 +02:00
ef552b72f9
Add zsh completion for 'docker build --build-arg'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 89e0990224f520f8772da4872dd277bae2c1287f
Component: engine
2015-10-16 08:48:12 +02:00
9a4b26a580
Deprecate 'docker run -c' option in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: c37c9df18a2fc3c34be3d8d21dae16553c8d4633
Component: engine
2015-10-16 08:37:16 +02:00
5f8debf9b3
Add zsh completion for 'unless-stopped' restart policy
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cb2bd8bcec38a597208209f0fb52593f3b6844a4
Component: engine
2015-10-16 08:30:56 +02:00
1c1b8094f5
Clean up integration-cli/docker_api_version_test.go
...
Signed-off-by: Kevin P. Kucharczyk <kevinkucharczyk@gmail.com >
Upstream-commit: 6f1b5946b13e617ab18c5325aac4859620045425
Component: engine
2015-10-16 07:03:39 +02:00
74b88c7e5c
Speedup container list
...
Remove all unneeded disk operations (reload TagStore, umarshal image)
for checking if image still points to same ID. Now slowest part is
queries to sqlite which hopefuly will be removed soon.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f256d8ad2d1fbd9407d2b7a8eb69c96665c4015e
Component: engine
2015-10-15 20:41:35 -07:00
0425a13d99
Merge pull request #16932 from c0b/fix-race-16924
...
Fix race #16924 [panic: runtime error: slice bounds out of range] docker daemon crash of racing
Upstream-commit: d35a1f2868692fb351e2ea84efc0014468fff293
Component: engine
2015-10-15 18:05:05 -05:00
d58c97726f
Merge pull request #17073 from ZJaffee/api_events_test
...
Cleaned up integration-cli/docker_api_events_test.go
Upstream-commit: 1052ff674cf41b175ce5ec764b489ff843675dbf
Component: engine
2015-10-16 00:22:29 +02:00
cd88a5b521
Merge pull request #17080 from ZJaffee/api_logs_test
...
Cleaned up integration-cli/docker_api_logs_test.go
Upstream-commit: 58b36ba242fd6c1d45f118d9b51ca2dd2cb395ee
Component: engine
2015-10-16 00:21:30 +02:00
30e90c5ea6
Merge pull request #16997 from Microsoft/10662-kill-parttwo
...
Windows: [TP4] docker kill handling part two
Upstream-commit: e1804098b9c9ebb6210af29045198bd5259bb834
Component: engine
2015-10-15 14:42:19 -07:00
24ba438ab4
Merge pull request #17082 from sdurrheimer/zsh-completion-remove-network-ls-old-options
...
Remove 'docker network ls -n -l --latest' options from in zsh completion
Upstream-commit: ebfed4d474489bfa8b0d16f6628c1e28388d8ea3
Component: engine
2015-10-15 13:48:39 -07:00
c1a007f689
Merge pull request #17084 from sdurrheimer/zsh-completion-network-ipam
...
Add zsh completion for '--ipam-driver --subnet --ip-range --gateway -…
Upstream-commit: ff4026fa5be873b5d5ec9aad733e5aaedadf516e
Component: engine
2015-10-15 13:48:19 -07:00
494b1b71ae
Correct API docs for /images/create
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2ec4404ba039c6e6c40358cecd7d7ca16ee5b3e7
Component: engine
2015-10-15 16:00:05 -04:00
de9c63d909
Add zsh completion for '--ipam-driver --subnet --ip-range --gateway --aux-address' for 'docker network create'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a00c0d795dcba112262d3dd297247259f9b50488
Component: engine
2015-10-15 21:40:50 +02:00
d24169e5d2
Remove '-n -l --latest' options from 'docker network ls' in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 080a906aac1760922a2791e86dc10190600c9f7c
Component: engine
2015-10-15 21:12:31 +02:00
2a30cdb717
Merge pull request #17057 from mavenugo/nls
...
Added `network` to docker --help and help cleanup
Upstream-commit: f255155f6b2e2205b9d644c663f2c8fb1570d4fe
Component: engine
2015-10-15 11:00:43 -07:00
