From 343fc18c7b1ecb87b247d1fb23b295f740b7d3cb Mon Sep 17 00:00:00 2001
From: Mahadev Konar <mahadev@apache.org>
Date: Tue, 11 Oct 2011 07:01:10 +0000
Subject: [PATCH] MAPREDUCE-3167. container-executor is not being packaged with
 the assembly target. (mahadev) - Merging r1181634 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181635 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt      | 3 +++
 hadoop-mapreduce-project/assembly/all.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index fe4e321f03f..6f65299a3c5 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -1533,6 +1533,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3158. Fix test failures in MRv1 due to default framework being
     set to yarn. (Hitesh Shah) 
 
+    MAPREDUCE-3167. container-executor is not being packaged with the assembly
+    target. (mahadev)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/assembly/all.xml b/hadoop-mapreduce-project/assembly/all.xml
index 32c9a799ceb..2121aab64aa 100644
--- a/hadoop-mapreduce-project/assembly/all.xml
+++ b/hadoop-mapreduce-project/assembly/all.xml
@@ -9,7 +9,7 @@
   <!-- TODO: this layout is wrong. We need module specific bin files in module specific dirs -->
   <fileSets>
     <fileSet>
-      <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target/classes/bin</directory>
+      <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/c/container-executor</directory>
       <outputDirectory>bin</outputDirectory>
       <includes>
         <include>container-executor</include>