hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jia...@apache.org
Subject hadoop git commit: YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. Contributed by Abin Shahab
Date Wed, 19 Nov 2014 22:44:46 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk 73348a4af -> bc4ee5e06


YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. Contributed by Abin Shahab


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bc4ee5e0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bc4ee5e0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bc4ee5e0

Branch: refs/heads/trunk
Commit: bc4ee5e06f89b2037e0967f8ba91089ced4b7f0e
Parents: 73348a4
Author: Jian He <jianhe@apache.org>
Authored: Wed Nov 19 14:44:25 2014 -0800
Committer: Jian He <jianhe@apache.org>
Committed: Wed Nov 19 14:44:25 2014 -0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                   |  3 +++
 .../src/site/apt/DockerContainerExecutor.apt.vm   | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc4ee5e0/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b394a91..7f61601 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -112,6 +112,9 @@ Release 2.7.0 - UNRELEASED
     YARN-2870. Updated the command to run the timeline server in the document.
     (Masatake Iwasaki via zjshen)
 
+    YARN-2878. Fix DockerContainerExecutor.apt.vm formatting. (Abin Shahab via
+    jianhe)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bc4ee5e0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm
index 4573173..db75de9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/DockerContainerExecutor.apt.vm
@@ -133,15 +133,18 @@ as at present the DockerContainerExecutor does not support per-job docker
login.
    Currently you cannot configure any of the Docker settings with the job configuration.
 You can provide Mapper, Reducer, and ApplicationMaster environment overrides for the
 docker images, using the following 3 JVM properties respectively(only for MR jobs):
-  * mapreduce.map.env: You can override the mapper's image by passing 
-yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
-to this JVM property.
+
+  * mapreduce.map.env: You can override the mapper's image by passing
+    yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
+    to this JVM property.
+
   * mapreduce.reduce.env: You can override the reducer's image by passing
-yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
-to this JVM property.
+    yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
+    to this JVM property.
+
   * yarn.app.mapreduce.am.env: You can override the ApplicationMaster's image
-by passing yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
-to this JVM property.
+    by passing yarn.nodemanager.docker-container-executor.image-name=<your_image_name>
+    to this JVM property.
 
 * {Docker Image requirements}
 
@@ -185,6 +188,7 @@ jobs are started with the DockerContainerExecutor.
 
   * Pick a custom Docker image if you want. In this example, we'll use sequenceiq/hadoop-docker:2.4.1
from the
 docker hub repository. It has jdk, hadoop, and all the previously mentioned environment variables
configured.
+
   * Run:
 
 ----


Mime
View raw message