From c359e2a6a44e63f533c6f8a9c791467c1da68597 Mon Sep 17 00:00:00 2001
From: Jian He <jianhe@apache.org>
Date: Wed, 19 Nov 2014 14:44:25 -0800
Subject: [PATCH] YARN-2878. Fix DockerContainerExecutor.apt.vm formatting.
 Contributed by Abin Shahab (cherry picked from commit
 bc4ee5e06f89b2037e0967f8ba91089ced4b7f0e)

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

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 1899ceaa90d..fd59311bfe2 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -85,6 +85,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
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 45731735cae..db75de90c4f 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:
 
 ----