Vincent Demeester
1bcc42e038
Merge pull request #22742 from yongtang/05142016-update-deprecated-docs-for-LXC-built-in-exec-driver
...
Update deprecated docs for LXC built-in exec driver
2016-05-15 05:47:09 +02:00
Yong Tang
1391e75d45
Update deprecated docs for LXC built-in exec driver
...
The LXC built-in exec driver has been deprecated in 1.8 and
further removed in 1.10, yet in deprecated.md it still shows:
```
Target For Removal In Release: v1.10
```
This fix changes the above to `Removed In Release:`.
In addition, lxc-conf flag and API fields have already been
removed in 1.10 as well so the related description has also been
updated in this fix.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-14 17:30:19 -07:00
Sebastiaan van Stijn
e333675cd7
Merge pull request #22743 from yongtang/05142016-typo-in-work-with-networks
...
Fix a typo in work-with-networks.md
2016-05-15 02:15:45 +02:00
Yong Tang
414b9dea8a
Fix a typo in work-with-networks.md
...
This fix fixes a typo in the documentation of `work-with-networks.md`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-14 16:58:18 -07:00
Sebastiaan van Stijn
fbf3741f0d
Merge pull request #22740 from sdurrheimer/zsh-completion-network-ls-filter-label
...
Add zsh completion for 'docker network ls --filter label'
2016-05-14 22:27:00 +02:00
Sebastiaan van Stijn
c80f926997
Merge pull request #22739 from sdurrheimer/zsh-completion-daemon-concurrent
...
Add zsh completion for 'docker daemon --max-concurrent-downloads --ma…
2016-05-14 22:25:59 +02:00
Sebastiaan van Stijn
14348e9cca
Merge pull request #22738 from sdurrheimer/zsh-completion-logs-details
...
Add zsh completion for 'docker logs --details'
2016-05-14 22:25:05 +02:00
Steve Durrheimer
afca8a454a
Add zsh completion for 'docker network ls --filter label'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:38:39 +02:00
Steve Durrheimer
bf9a1d5027
Add zsh completion for 'docker daemon --max-concurrent-downloads --max-concurrent-uploads'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:20:20 +02:00
Steve Durrheimer
dcca0f6dd1
Add zsh completion for 'docker logs --details'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-14 19:13:01 +02:00
Sebastiaan van Stijn
89bb4d96e4
Merge pull request #22737 from tkopczynski/typo-imagesandcontainers
...
Small fix in images and containers docs
2016-05-14 17:57:45 +02:00
Tomasz Kopczynski
d0ab1c360f
Small fix in images and containers docs
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-14 16:09:49 +02:00
Vincent Demeester
aa197f147d
Merge pull request #22735 from yongtang/22463-22590-emit-docker-daemon-reload-event
...
Vendor engine-api to allow docker daemon reload event
2016-05-14 11:49:01 +02:00
Vincent Demeester
2f94a367d7
Merge pull request #22720 from thaJeztah/fix-markdown
...
Fix Markdown formatting in Devicemapper docs
2016-05-14 10:12:15 +02:00
Yong Tang
d365c0e151
Fix failed test for TestRestartPolicy
...
This commit is a follow up of the last commit:
Vendor engine-api to allow docker daemon reload event.
After vendor/engine-api has been updated, the following
unit test fails:
```
--- FAIL: TestRestartPolicy (0.00s)
hostconfig_test.go:177: RestartPolicy.IsNone for { 0} should have been false but was true
```
The reason for the above failed unit test is that pull request:
https://github.com/docker/engine-api/pull/200
updated behavior of the restart policy and makes restartpolicy.IsNone
return true if restart policy name is `""`. As a result, the above
mentioned unit test fails.
This fix fixes the inconsistency of the unit test so that `TestRestartPolicy`
could pass again.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-13 20:39:35 -07:00
Yong Tang
0f57f47ac3
Vendor engine-api to allow docker daemon reload event.
...
This fix updated the vendored engine-api to version
e374c4fb5b121a8fd4295ec5eb91a8068c6304f4, which defines a new event
type of `DaemonEventType`. The purpose is to allow emitting`
`daemon reload` event as is raised in #22463 .
This fix is related to #22463 and #22590 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-13 20:39:24 -07:00
Sebastiaan van Stijn
3723b88406
Merge pull request #22727 from clawconduce/master
...
Fix error for env variables example in docker reference
2016-05-14 01:00:55 +02:00
Charles Law
2af7c5cfe2
Fix error for env variables example in docker reference
...
Signed-off-by: Charles Law <claw@conduce.com>
2016-05-13 10:55:36 -07:00
Sebastiaan van Stijn
5154856586
Fix Markdown formatting in Devicemapper docs
...
Fixes some text being presented as "code".
Also reformatted/wrapped some text and examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-13 15:41:45 +02:00
Sebastiaan van Stijn
a213a446d7
Merge pull request #22714 from albers/completion-logs--details
...
bash completion for `docker logs --details`
2016-05-13 14:37:45 +02:00
Sebastiaan van Stijn
c4dd432fd4
Merge pull request #22713 from albers/completion-daemon-concurrent
...
bash completion for `docker daemon --max-concurrent-{down,up}load`
2016-05-13 14:36:14 +02:00
Vincent Demeester
29fe2f34d2
Merge pull request #22588 from runcom/fix-authz-tests
...
pkg: authorization: cleanup tests
2016-05-13 10:29:45 +02:00
Harald Albers
d166c8fbb2
bash completion for docker logs --details
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-13 08:42:43 +02:00
Harald Albers
cc6bcaaddc
bash completion for docker daemon --max-concurrent-{down,up}load
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-13 08:25:53 +02:00
Sebastiaan van Stijn
9de21de453
Merge pull request #22462 from Microsoft/jjh/22181unittests
...
Windows: Reduce CLI time, move some to unit tests
2016-05-13 00:27:29 +02:00
Alexander Morozov
cf783266ff
Merge pull request #22279 from WeiZhang555/wait-channel
...
Remove WaitRunning
2016-05-12 14:56:55 -07:00
Alexander Morozov
e811e9784f
Merge pull request #22544 from Microsoft/jjh/terminate
...
Windows: Terminate on failed shutdown, fixes dockerd deadlock
2016-05-12 14:46:56 -07:00
Alexander Morozov
95872b65fb
Merge pull request #22636 from sean-jc/fix-oom-killer-tests
...
Add the swapMemorySupport requirement to OOM tests
2016-05-12 14:41:55 -07:00
Alexander Morozov
c95f1fcbd9
Merge pull request #22679 from cyli/bump-notary-version
...
Bump notary version up to 0.3.0 and re-vendor.
2016-05-12 14:38:07 -07:00
Sebastiaan van Stijn
ab090291dd
Merge pull request #22707 from TimWolla/patch-1
...
User network does not work with IPv6
2016-05-12 23:27:57 +02:00
Tim Düsterhus
f6ecba1045
Clarify that --ip does not work with IPv6 in docker run
...
Closes docker/docker#22707
Signed-off-by: Tim Düsterhus <tim@bastelstu.be>
2016-05-12 23:19:46 +02:00
Sebastiaan van Stijn
2ae863c28f
Merge pull request #22683 from npcode/docs-no-request-status
...
docs: Remove RequestStatusCode
2016-05-12 21:29:45 +02:00
Alexander Morozov
150009e9d8
Merge pull request #22630 from thaJeztah/refactor-overlay-compatibility
...
refactor overlay storage driver compatibility check
2016-05-12 12:00:57 -07:00
Alexander Morozov
350832acfa
Merge pull request #22698 from cpuguy83/22612_fix_map_access
...
Fix concurrent map access in bytespipe
2016-05-12 11:51:54 -07:00
John Howard
b5094fbd2d
Merge pull request #22333 from thaJeztah/update-label-description
...
RFC: Add "process" labels
2016-05-12 11:39:14 -07:00
Arnaud Porterie
e9117578a7
Merge pull request #22445 from yongtang/20936-22443-concurrent-connection
...
Docker pull/push with max concurrency limits.
2016-05-12 08:51:28 -07:00
Brian Goff
194c72611d
Fix concurrent map access in bytespipe
...
When getting and returning a buffer, need to make sure to syncronize
access to the pools map.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-12 10:04:05 -04:00
Vincent Demeester
475c37dd66
Merge pull request #22694 from allencloud/fix-typos-in-docs
...
docs: correct some typos
2016-05-12 14:35:39 +02:00
Vincent Demeester
edf5e097a2
Merge pull request #22687 from haoshuwei/fix-docs-securitymd
...
Fixing security.md
2016-05-12 14:35:21 +02:00
Vincent Demeester
7fd9f9964a
Merge pull request #22620 from yongtang/05092016-remove-deprecated-driver-specific-log-tags
...
Remove deprecated driver specific log tags
2016-05-12 13:20:07 +02:00
allencloud
57e2a82355
fix typos in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-12 18:38:02 +08:00
Vincent Demeester
ec2b0c0889
Merge pull request #22682 from hqhq/hq_update_check
...
Update go-check
2016-05-12 12:09:36 +02:00
Vincent Demeester
24a0f1f3e8
Merge pull request #22689 from thaJeztah/docs-update-menu-order
...
docs: update menu order in security section
2016-05-12 11:22:44 +02:00
Sebastiaan van Stijn
067e54eeac
docs: update menu order in security section
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-12 11:19:53 +02:00
Sebastiaan van Stijn
a14e85c40d
Merge pull request #22579 from jfrazelle/docs-add-security-non-events
...
docs: add security non-events
2016-05-12 11:17:47 +02:00
Hao Shu Wei
73d96a6b17
Fixing security.md
...
Signed-off-by: Hao Shu Wei <haoshuwei1989@163.com>
2016-05-12 16:52:03 +08:00
Vincent Demeester
84a6818b11
Merge pull request #22622 from tkopczynski/20784-builder-intg2unit-tests
...
Reimplement some builder integration tests as unit tests
2016-05-12 10:29:39 +02:00
cyli
6094be63ac
Bump notary version up to 0.3.0 and re-vendor.
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-11 22:57:51 -07:00
Yi EungJun
aed525384a
docs: Remove RequestStatusCode
...
The requests doesn't include RequestStatusCode field.
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-05-12 14:27:22 +09:00
Sven Dowideit
c273163e80
Merge pull request #22672 from kevinmeredith/correct_trapped_signals
...
Correct docs for a docker container's clean-up.
2016-05-12 14:15:39 +10:00