c4eabb777e
fix typo for docs reference
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 0f0b0db842e53c81191385395d6d040574eeb0d9
Component: engine
2016-09-18 11:00:19 +08:00
53e4b9f336
Merge pull request #26676 from Microsoft/jjh/tp5graphdriver
...
Windows: Remove TP5 hack from graphdriver
Upstream-commit: beea4d93dc070a5e6a085aaf7991d7738b65841f
Component: engine
2016-09-17 19:54:58 -07:00
a54b053e2e
Merge pull request #26662 from WeiZhang555/fix-flaky-unit-test
...
Fix flaky unit test
Upstream-commit: 56952e2159f464e2b3a038b81b8d11be45cee308
Component: engine
2016-09-17 18:32:11 -07:00
d5426f0e52
Windows: Remove TP5 hack from graphdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f61315f0df480b261a70278360b08f32c991d3ef
Component: engine
2016-09-17 16:16:50 -07:00
0103a7b417
Merge pull request #26669 from cpuguy83/vendor_syslog
...
re-vendor syslog package
Upstream-commit: 0589358eec634a188eacde422ec8609d3814ca30
Component: engine
2016-09-17 10:27:21 -07:00
5049c43226
Merge pull request #25737 from Microsoft/jjh-statistics
...
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
2016-09-17 09:31:24 -07:00
fe6c7fd94a
re-vendor syslog package
...
Fixes #26394
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f528690674712b680caf2712092c7e2f8f236491
Component: engine
2016-09-17 10:25:05 -04:00
029442b3b0
Merge pull request #26634 from thaJeztah/fix-api-docs-for-services
...
Fix service and tasks API documentation
Upstream-commit: 788a8a3cac67b72d3c52bd3bc8b09fcc0ee438a8
Component: engine
2016-09-17 16:13:15 +02:00
613c0e8111
Merge pull request #26654 from thaJeztah/sync-api-docs
...
Synchronize API docs
Upstream-commit: 1fb556bb7ebed206ebacf13148f912f7347d5489
Component: engine
2016-09-17 16:11:42 +02:00
301b810036
Merge pull request #26656 from miaoyq/rename-name-to-destination
...
Rename the variable 'name' to 'destination'
Upstream-commit: e54171378c7e7e17738a48e9ef768bbe337d0c28
Component: engine
2016-09-17 16:01:02 +02:00
66c468a968
Merge pull request #26606 from dnephin/move_errors
...
Move errors package to api/errors
Upstream-commit: 5d7b725071a7cc7c994f2f7f6a29352790f5096a
Component: engine
2016-09-17 16:00:38 +02:00
19194e282c
Merge pull request #26643 from allencloud/validate-two-service-modes-in-request
...
return err when both two service modes in request
Upstream-commit: 1d8ad2974eb7dfe4f6f48c5fee28efa89cf6821f
Component: engine
2016-09-17 15:50:55 +02:00
508525f5e5
Merge pull request #26649 from dperny/add-comment-to-endpointspec
...
Added comments to PortConfig for greater clarity
Upstream-commit: 6d8598f4bb98b7e3f04bf3a3dd039900414fe465
Component: engine
2016-09-17 08:16:32 -04:00
b82751259c
Merge pull request #26555 from miaoyq/refactor-aufsMount
...
refactor the function 'aufsMount' in 'daemon/graphdriver/aufs/aufs.go'
Upstream-commit: 354835695730c32a3c2374d2453d3cdf73bf4ee0
Component: engine
2016-09-17 08:04:18 -04:00
665d5fc5bb
Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version
...
Move HostConfig.Mounts to correct API version
Upstream-commit: 2f5b37919286f272b591ab428fee13cb6b5d0014
Component: engine
2016-09-17 13:53:37 +02:00
1dc2c82ca8
Fix flaky unit test
...
Fix flaky test `TestHTTPTimeout` caused by precision problem.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: bc5768733db79874d8918e8499df01d68cae2d6e
Component: engine
2016-09-17 19:40:58 +08:00
a4d4b2606e
return err when both two service mode in request
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: c413d4177b9621d6bcfd24c9b7118887ad378c49
Component: engine
2016-09-17 19:04:46 +08:00
af2690a8bf
Rename the variable 'name' to 'destination'
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 57cec5a777e93486f14151087d178e3569d25d2b
Component: engine
2016-09-17 10:52:11 +08:00
32dd641688
Merge pull request #26266 from YuPengZTE/dev
...
The etc and dot is seprated
Upstream-commit: d93a62e9bef374ff501f155583e707c1ae77926b
Component: engine
2016-09-17 03:37:00 +02:00
6c1fbaf344
Merge pull request #26289 from aboch/doc
...
Fix mtu option in documentation
Upstream-commit: 1c117aa8cccd895645e6fb5245bfb4cd11b93ba8
Component: engine
2016-09-17 03:32:23 +02:00
7c0fb8cd9f
Merge pull request #26540 from sfsmithcha/remove_charles_from_maintainers
...
removes sfsmithcha from maintainers
Upstream-commit: 30839b0688ed4e2aeae2d1390652122d33b1efea
Component: engine
2016-09-17 03:28:23 +02:00
8cdc29bdf2
Merge pull request #26558 from lixiaobing10051267/masterSymbol2
...
add bash symbol for docker network inspect
Upstream-commit: 0bd281c7cb610baa2b906d7eb42062eeb209b1a9
Component: engine
2016-09-17 03:26:55 +02:00
a36bf5dcfd
Merge pull request #26557 from schmunk42/patch-1
...
fix typo
Upstream-commit: 258fa6c23fa7b174958a56677fff0737ea954811
Component: engine
2016-09-17 03:26:11 +02:00
0a2b85a132
Synchronize API docs
...
This synchronizes changes between API versions, and:
- applies e0a552504e64192946c86d3bdd517ae7b3af348f to
older versions of the documentation
- applies a2a0a03e2b801545b2e3fb9e8476c76370da9175 to
API version 1.25
- syncs some minor differences
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 53b1dcb25ca937c61bd47a29ba7be6e68abc25a5
Component: engine
2016-09-17 03:02:12 +02:00
7bce42c737
Move HostConfig.Mounts to correct API version
...
This was added in fc7b904dced4d18d49c8a6c47ae3f415d16d0c43,
but some parts of the documentation ended up in the
wrong API version, and was overlooked during
review :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cd73ceffd84d6d3af695a70485ca0d7899d0475a
Component: engine
2016-09-17 02:36:07 +02:00
a3575ae5f7
Fix service and tasks API documentation
...
The documentation contained some outdated information
on these endpoints.
This change fixes those parts of the documentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d69409fd43e73829209315de79abf79000c4c720
Component: engine
2016-09-17 02:29:38 +02:00
0529a1ae57
Added comments to PortConfig for greater clarity
...
I always forget which one is which. Now, I can't forget. This is
probably in the docs somewhere but now it's handy at a glance.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 55454752f825a5ec033ca072350a77a928afd6ac
Component: engine
2016-09-16 14:47:35 -07:00
93e3695b69
Merge pull request #26387 from Microsoft/jjh/securityopts
...
Only output security options if there are any
Upstream-commit: 94bc2b1bc07843087c0096d06fdb56d70aa45a02
Component: engine
2016-09-16 23:05:30 +02:00
3e89d9cc8d
Remove extra paren in run --link docs
...
Signed-off-by: Josh Bodah <jb3689@yahoo.com >
Upstream-commit: 484fbe236dcab9fb5b8d48844a8cdc9d614e32e9
Component: engine
2016-09-16 15:32:12 -04:00
7342ae40e2
Windows: stats support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
2016-09-16 11:56:15 -07:00
4f3981c6de
Merge pull request #26620 from runcom/fix-docs
...
docs: reference: api: clarify pull all tags
Upstream-commit: 8a7006ff8e74477c4ad85bde2e2094f7b40244da
Component: engine
2016-09-16 20:56:04 +02:00
fc3c6766ab
Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
...
Splunk Logging Driver performance improvements
Upstream-commit: efe4e914efe5f42a5b5e424ed519fda71343f7de
Component: engine
2016-09-16 10:22:09 -07:00
39533df3e9
Only output security options if there are any
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: dd3d223a7ea3fc35eeeb255fc97a7bc46936cae5
Component: engine
2016-09-16 10:05:21 -07:00
e90292dd20
Use apiError in server version middleware.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bcb0405239e0c820516b05ccc2bb7e8d4a1599f9
Component: engine
2016-09-16 12:27:14 -04:00
d47b1c8a71
Move errors/ to api/errors
...
Using:
gomvpkg -from github.com/docker/docker/errors
-to github.com/docker/docker/api/errors
-vcs_mv_cmd "git mv {{.Src}} {{.Dst}}"
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c452e1bfe6b19d44bf2ed2a1eb8aef7e23d6bafb
Component: engine
2016-09-16 12:27:13 -04:00
3a3e6ec157
Merge pull request #26637 from thaJeztah/fix-cli-prompt
...
Use "sudo" for dockerd examples
Upstream-commit: d05e34ca9bcfdcf954ea5793721c20133eed9277
Component: engine
2016-09-16 17:44:07 +02:00
15e6354e7d
Use "sudo" for dockerd examples
...
Because we standardize on using a non-privileged
prompt (`$`) instead of `#`, replacing the
examples to use `sudo` instead to indicate
this has to be run as root.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 87b174080bd8b1b9ea2bbfad8ef35a4c0dfe8ad4
Component: engine
2016-09-16 17:22:58 +02:00
a7caeb2743
Merge pull request #26618 from AkihiroSuda/fix-apparmor
...
apparmor: prohibit /sys/firmware/** from being accessed
Upstream-commit: 07b5311147c319a003324e8f26ceb829ed5cc240
Component: engine
2016-09-16 07:41:36 -07:00
db61cfcc59
docs: reference: api: clarify pull all tags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 03a8b6798d030a952e85f15208aeea1215e3f801
Component: engine
2016-09-16 16:35:15 +02:00
6f7161dac7
Add link to logging drivers reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7ca02f86de2ceef980cad98faefc15cbc628c91a
Component: engine
2016-09-16 15:29:28 +02:00
2571b1712e
Merge pull request #26541 from LK4D4/update_labels
...
project: add area/daemon and area/docs labels
Upstream-commit: 76ee0e8185d4219bd8539ca8f33d387376422ef4
Component: engine
2016-09-16 08:55:04 +02:00
774de454aa
Merge pull request #26613 from Microsoft/jjh/14393
...
Windows: Turn off builds<14393
Upstream-commit: 38d187d3ae28cb9453ee2baba64344f017e84c78
Component: engine
2016-09-16 08:47:00 +02:00
17ba48af4f
Merge pull request #26583 from aboch/vnd
...
Vendoring libnetwork @c8ce8c7
Upstream-commit: 4adbd5338d8f76e1a0895583f580993221451b08
Component: engine
2016-09-15 20:28:07 -07:00
4fb324e592
Merge pull request #26607 from aboch/vnd2
...
Vendoring boltdb @fff57c100
Upstream-commit: 518e000e70b1db807db20cc9a6c42311ba385d69
Component: engine
2016-09-15 20:24:29 -07:00
8f9c1794c9
Merge pull request #26512 from AkihiroSuda/fix-pkg-plugins-racy-test
...
[test] fix racy test in pkg/plugins
Upstream-commit: a1fc3852dace4b07996b8189a236938d9e0e21ae
Component: engine
2016-09-15 20:11:03 -07:00
23bac4b64f
apparmor: prohibit /sys/firmware/** from being accessed
...
Some firmware information including SMBIOS and ACPI tables were unexpectedly exposed
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 693b4ac67ad0638be9defbae771f62d860380f31
Component: engine
2016-09-16 02:21:31 +00:00
6bbb3e807c
fix racy test in pkg/plugins
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 4bc908ec8910468711960a4bcd4f3ec8dce909fb
Component: engine
2016-09-16 01:43:35 +00:00
18e664bb52
Windows: Turn off builds<14393
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cc4e17cbbac8196d3ab58e45318612b95bd28994
Component: engine
2016-09-15 15:20:16 -07:00
4efffd499d
Merge pull request #26537 from dnephin/refactor_cli_formatter
...
Refactor cli/command/formatter
Upstream-commit: a7c25f954062de230dea0f1816b553992fa1d967
Component: engine
2016-09-15 21:52:52 +02:00
1a62240ad4
Merge pull request #26511 from AkihiroSuda/fix-pkg-archive-racy-test
...
[test] fix racy tests in pkg/archive
Upstream-commit: b2263c111f1a0e8efc8646655c03fd73ce2d258b
Component: engine
2016-09-15 11:10:34 -07:00
