44eef57d91
Merge pull request #22542 from thaJeztah/fix-outdated-supervisor-example
...
docs: update supervisord example
Upstream-commit: 83a6508af9e5b911160b448af549d30a0fd95d56
Component: engine
2016-05-06 14:58:13 +02:00
5915e71127
Merge pull request #22550 from allencloud/fix-typos
...
fix typos in comments
Upstream-commit: cc01017bcf631ea82485ecb235b24008efe4359d
Component: engine
2016-05-06 08:56:33 -04:00
fe5c78bee9
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 3f77baf2ce3a607fd1eb8fbe6e9dd9da44a8db49
Component: engine
2016-05-06 18:23:11 +08:00
cf5ef9f29e
Merge pull request #22046 from cpuguy83/containerd_stdio
...
Set containerd pdeathsig
Upstream-commit: 9a9ebc7f85319fabbdcc98cfed10d77ac896f0f1
Component: engine
2016-05-06 09:26:16 +02:00
9f5c8a18bb
Merge pull request #22501 from michael-holzheu/22477-TestApiStatsContainerGetMemoryLimit-add-mem-cgroup-test
...
TestApiStatsContainerGetMemoryLimit: Add cgroup memory test
Upstream-commit: f65f4dc76103986542bc5472c4ae992ecfa74c07
Component: engine
2016-05-06 09:12:27 +02:00
7d1fcfae6b
Merge pull request #22538 from mrunalp/update_engine_api
...
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
Upstream-commit: a7d6a6c8a8cdb5a71a9388b6cec14f280d3f2f80
Component: engine
2016-05-06 09:06:51 +02:00
1ae186f482
Merge pull request #21961 from yongtang/21956-docker-inspect-log-default-options
...
Docker inspect gave default log options even when the option is emtpy.
Upstream-commit: e9bef66021a29c219c185e98db7f3017513f67a6
Component: engine
2016-05-05 21:02:39 -04:00
b45f47d8a2
docs: update supervisord example
...
This updates the supervisor example documentation
to use an up-to-date version of Ubuntu.
Also reduced the use of "royal We", and tweaked some
language.
Finally, added some language hints for code-highlighting.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e38678e6601cc597b621aaf3cf630419a7963ae9
Component: engine
2016-05-06 01:52:51 +02:00
b07f1e75d0
Update engine-api to 1fb8f09960cc32b9648495a422c960fb2a4f8a09
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 97d95604e0f2ac259d60257db0282561e5f52d03
Component: engine
2016-05-05 18:36:09 -04:00
487e1370df
Merge pull request #22535 from mlaventure/fix-oraclelinux-6-rpm
...
Fix rpm generation on oraclelinux-6
Upstream-commit: 68ba274d22355d54a96fdee06591e7ed9535733c
Component: engine
2016-05-05 14:56:41 -07:00
991c954a45
Fix rpm generation on oraclelinux-6
...
The uek kernel needs to be install first in order to get the correct
btrfs tools version.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 05dec0b032a6bde63a803141e2ccd48daa1a494e
Component: engine
2016-05-05 12:12:49 -07:00
83644199c7
Merge pull request #21015 from cpuguy83/add_opaque_mount_id
...
When calling volume driver Mount, send opaque ID
Upstream-commit: bb125650c9fbff03d57c20fd8e4ecde90b3ec326
Component: engine
2016-05-05 18:00:15 +02:00
e5dc90cedd
Merge pull request #22505 from runcom/authz-load-import
...
integration-cli: test load/import with authz plugins
Upstream-commit: 0d3d8d6416bdadf3a6e018a18cb97f5162da1fb1
Component: engine
2016-05-05 11:37:20 -04:00
5f74b3f785
Merge pull request #22529 from objectified/22528-remove-trailing-comma-from-top-command
...
Documentation: docker volumes: remove trailing comma from top command
Upstream-commit: c37ca913ff66b4402aaa8f54e17498a09778be51
Component: engine
2016-05-05 17:26:06 +02:00
c427081daf
remove trailing comma from top command
...
Signed-off-by: objectified <objectified@gmail.com >
Upstream-commit: c7e738d641e83ab955be423b70b9ed364dba9637
Component: engine
2016-05-05 13:18:23 +02:00
45f5ea437e
Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files
...
Add dockerd to the list of files included in generated rpms
Upstream-commit: af916d316af19bcfa17619c6bf84dcc0fa69cb7a
Component: engine
2016-05-05 13:16:06 +02:00
0dddb7f45c
Merge pull request #19651 from zhuguihua/add_disk_quota_for_btrfs
...
Add disk quota support for btrfs
Upstream-commit: 6dd4c3569cf5c844473cad8dea26c2e93e994131
Component: engine
2016-05-05 13:15:45 +02:00
940b2e7c3c
Merge pull request #22270 from runcom/too-many-login
...
distribution: errors: do not retry if too many login attempts
Upstream-commit: 4de672690ce10bf106387bd40d536bc19350345f
Component: engine
2016-05-05 09:44:09 +02:00
576dc33c5e
Merge pull request #22508 from Microsoft/jjh/arg
...
Windows: Support ARG in builder
Upstream-commit: 378a8e71755e86bab0e6c18022bf457a9c79e166
Component: engine
2016-05-05 09:09:55 +02:00
7884e766dc
Add disk quota support for btrfs
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com >
Upstream-commit: 401c8d17674379d9b727d25df2d560a2dfe07f27
Component: engine
2016-05-05 14:35:13 +08:00
91d4a233cd
Add dockerd to the list of files included in generated rpms
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6118952e449bb70bcc06e9d342affc593262a44e
Component: engine
2016-05-04 20:45:22 -07:00
6901a6e26a
Merge pull request #22166 from moxiegirl/device-mapper-update
...
Device mapper update
Upstream-commit: 6870d9789aea578f54e443293625a6b57496e10f
Component: engine
2016-05-05 00:02:02 +02:00
4438134821
Merge pull request #22512 from tkopczynski/typos-supervisor
...
Docs: fixing typos in admin/supervisor
Upstream-commit: 6dcadaa46524c90f5c60e3006322b86aa240aeed
Component: engine
2016-05-04 23:57:55 +02:00
f660cfb0a4
Merge pull request #22423 from mlaventure/rm-containers-if-rm-in-progress-on-restart
...
Reset RemovalInProgress flag on daemon restart
Upstream-commit: 1fe9715f309fced92ea815fb365e08334fd49930
Component: engine
2016-05-04 23:57:16 +02:00
a6ae3cf211
Merge pull request #22403 from mlaventure/fix-docker-build-pkgs
...
Update build-deb to make correct use of DOCKER_BUILD_PKGS
Upstream-commit: 0c68402887f7403f4fa7a6abccd3181f5f66d75d
Component: engine
2016-05-04 17:55:20 -04:00
b06eb99229
Windows: Support ARG in builder
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6b5c83bf18fe406e397c001acb0a1d9d7e147fd9
Component: engine
2016-05-04 14:32:23 -07:00
751e7f2553
Docs: fixing typos in admin/supervisor
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: 74d382ff8de9a870d48e7fd4cc63bb9ee254f3de
Component: engine
2016-05-04 22:35:57 +02:00
e7e33c529a
Merge pull request #22475 from Microsoft/jjh/twoconcurrentcontainers
...
Reduce time for TestRunTwoConcurrentContainers
Upstream-commit: e4a4570369d53adbf74b8cb84d8b7301a32689bd
Component: engine
2016-05-04 12:38:13 -07:00
16a8047841
Add docs about how to extend devicemapper thin pool
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Update to device mapper
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: a7b2f87b0637a3711e90c0f1d0a99dd5d32bd60f
Component: engine
2016-05-04 12:32:14 -07:00
11be2b26e1
TestApiStatsContainerGetMemoryLimit: Add cgroup memory test
...
Currently on kernels booted without the "cgroup_enable=memory" kernel
parameter the testcase TestApiStatsContainerGetMemoryLimit fails with:
FAIL: docker_api_stats_test.go:231: TestApiStatsContainerGetMemoryLimit.pN52_github_com_docker_docker_integration_cli.DockerSuite
docker_api_stats_test.go:256:
c.Assert(fmt.Sprintf("%d", v.MemoryStats.Limit), checker.Equals, fmt.Sprintf("%d", info.MemTotal))
... obtained string = "0"
... expected string = "33759145984"
Fix this and skip the testcase if the kernel does not support cgroup memory
limit. In that case the output would be:
SKIP: docker_api_stats_test.go:231:
TestApiStatsContainerGetMemoryLimit.pN52_github_com_docker_docker_integration_cli.DockerSuite
(Test requires an environment that supports cgroup memory limit.)
ChangeLog:
----------
v4: Move TestApiStatsContainerGetMemoryLimit to docker_api_stats_unix_test.go
v3: Use existing "memoryLimitSupport" from requirements_unix.go
v2: Move check to requirements.go
Fixes #22477
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: 8ba8189ee66fa36f7adb1f2bab6cc4c35ebfd8cd
Component: engine
2016-05-04 20:46:41 +02:00
0022a5af4e
distribution: errors: do not retry on too many requests from registry
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 66fbc0c2a3e813359654f21433abf995b6687265
Component: engine
2016-05-04 18:57:55 +02:00
6912e449fb
vendor docker/distribution 9ec0d742d69f77caa4dd5f49ceb70c3067d39f30
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 305ebfda8bc39b39f018d06a554245872b1ff63a
Component: engine
2016-05-04 18:57:35 +02:00
cd0e933563
integration-cli: test load/import with authz plugins
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 9613acbe5cd517f1fd4c8d405be3cfc24d249562
Component: engine
2016-05-04 18:45:22 +02:00
ec5a470dda
Merge pull request #22422 from cpuguy83/vendor_engine-api
...
Update engine-api
Upstream-commit: 973d6f082002eb4d55cf910325ce90d4f85c63a7
Component: engine
2016-05-04 10:12:29 -04:00
cd7f106f6e
Merge pull request #22499 from duglin/removeQuotes
...
Remove unnecessary double-double quotes
Upstream-commit: e7584a7fdf2170a5a75a2376ed914176665efab9
Component: engine
2016-05-04 15:35:45 +02:00
8de6090cf2
Merge pull request #22336 from thaJeztah/carry-21174-update-docker-info-docs
...
Updated docker-info output and documentation
Upstream-commit: c14b1e39641fd575f59ef8c8556158d595eff284
Component: engine
2016-05-04 15:33:21 +02:00
c441f187a4
Merge pull request #21947 from boynux/fix-filter-exited
...
exited=0 in filter shouldn't show "Created" ones
Upstream-commit: 4c88c67058080d5f780100cee71a5a9938841cfb
Component: engine
2016-05-04 15:21:59 +02:00
820803730c
Merge pull request #22386 from wenchma/dockerd
...
Update the `docker daemon` to `dockerd` for document
Upstream-commit: 1c1947dd29def10260e61688112eeac665761ace
Component: engine
2016-05-04 15:07:53 +02:00
bf2c596602
Remove unnecessary double-double quotes
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8eb2188bd93c01533e201a37e1e674f5b53cb597
Component: engine
2016-05-04 05:15:57 -07:00
9fbb9e861b
Merge pull request #22498 from Windfarer/patch-1
...
fix typo in docs
Upstream-commit: 9f29f66c290f8149415306e0f38d0ef299b9b87c
Component: engine
2016-05-04 13:37:28 +02:00
f77b6d2fb7
fix typo
...
fix typo
Signed-off-by: Qizhao Yang <windfarer@gmail.com >
Upstream-commit: 176e9e2ffc192862f104b13bdf651551c1e492f1
Component: engine
2016-05-04 19:18:38 +08:00
97d521660e
Merge pull request #22446 from thaJeztah/add-daemon-reload
...
Add support for reloading daemon configuration through systemd
Upstream-commit: 9c52a04f389d4bd2eb447c13a13003d79b746abc
Component: engine
2016-05-04 12:38:40 +02:00
4be167aee3
Merge pull request #22482 from anujbahuguna/master
...
Adding Rita Levi-Montalcini and Claude Shannon to name generator
Upstream-commit: 82141a28f525182ee638d5a63558f9545dcd1a7d
Component: engine
2016-05-03 22:28:16 +02:00
e8ace492bd
Merge pull request #22442 from thaJeztah/remove-issue-template-from-contributing
...
minor contributing.md cleanup
Upstream-commit: 5892083a8f26084faab9fd4ad2e348dbc8202504
Component: engine
2016-05-03 13:15:26 -07:00
1328fc105e
Merge pull request #22478 from Microsoft/jjh/clirunsleepingcontainer
...
runSleepingContainer consistency
Upstream-commit: 3b0a166b10e63f8f3f20dd4f4a5250993a9025d3
Component: engine
2016-05-03 13:11:27 -07:00
f31a4deeed
Adding Rita Levi-Montalcini and Claude Shannon to name generator
...
Signed-off-by: Anuj Bahuguna "anujbahuguna.dev@gmail.com "
Signed-off-by: Anuj Bahuguna <abahuguna@fiberlink.com >
Upstream-commit: fd8a6775f57c4fae1d7cc99560f4efe30e1ac9dd
Component: engine
2016-05-04 00:14:09 +05:30
bbb9555a0a
RunSleepingContainer consistency
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 481cc6716fdfda8db4481dd2a3dfde4d3d2edba5
Component: engine
2016-05-03 11:39:29 -07:00
368f007a03
Reduce time for TestRunTwoConcurrentContainers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 94f1e574b6469021c7c7fd3cad857a011cf93815
Component: engine
2016-05-03 10:55:20 -07:00
958cc5f73b
Merge pull request #22468 from thaJeztah/fix-dotcloud-link
...
Fix dotCloud link
Upstream-commit: 61d265964f56b589c96f503906872c0a25fb89e9
Component: engine
2016-05-03 19:30:13 +02:00
4d2b1dfdde
Merge pull request #22441 from tkopczynski/20784-builder-remote-tests
...
Unit test for builder/remote.go
Upstream-commit: 73a8b6e3aaacd440e6666f4a64554ea7c2ca4090
Component: engine
2016-05-03 09:51:19 -07:00
