Repository: hadoop
Updated Branches:
refs/heads/branch-2.8.3 9e6ac0509 -> 27e2c58ac
YARN-7361. Improve the docker container runtime documentation. Contributed by
Shane Kumpf
(cherry picked from commit fac72eef23bb0a74a34f289dd6ef50ffa4303aa4)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
(cherry picked from commit d26281556406e53f9694ec2c54172d836b80df56)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/27e2c58a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/27e2c58a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/27e2c58a
Branch: refs/heads/branch-2.8.3
Commit: 27e2c58acd818daee84d2a481fef6b7512102c8b
Parents: 9e6ac05
Author: Jason Lowe <jl...@apache.org>
Authored: Wed Nov 15 12:32:02 2017 -0600
Committer: Jason Lowe <jl...@apache.org>
Committed: Wed Nov 15 12:40:38 2017 -0600
----------------------------------------------------------------------
.../hadoop-yarn-site/src/site/markdown/DockerContainers.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/27e2c58a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
----------------------------------------------------------------------
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
index 28fdbbe..3390e68 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/DockerContainers.md
@@ -144,7 +144,8 @@ The following properties should be set in yarn-site.xml:
Optional. This configuration setting determines the capabilities
assigned to docker containers when they are launched. While these may not
be case-sensitive from a docker perspective, it is best to keep these
- uppercase.
+ uppercase. To run without any capabilites, set this value to
+ "none" or "NONE"
</description>
</property>
</configuration>
@@ -315,4 +316,4 @@ To run a Spark shell in Docker containers, run the
following command:
```
Note that the application master and executors are configured
-independently. In this example, we are using the hadoop-docker image for both.
\ No newline at end of file
+independently. In this example, we are using the hadoop-docker image for both.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
