diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6b0c12f116d..54c9c8799eb 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -8,6 +8,8 @@ Trunk (unreleased changes)
IMPROVEMENTS
+ OPTIMAZATIONS
+
BUG FIXES
Branch-2 ( Unreleased changes )
@@ -18,6 +20,8 @@ Branch-2 ( Unreleased changes )
IMPROVEMENTS
+ OPTIMAZATIONS
+
BUG FIXES
MAPREDUCE-2374. "Text File Busy" errors launching MR tasks. (Andy Isaacson
@@ -35,6 +39,11 @@ Release 2.1.0-alpha - Unreleased
YARN-29. Add a yarn-client module. (Vinod Kumar Vavilapalli via sseth)
+ YARN-10. Fix DistributedShell module to not have a dependency on
+ hadoop-mapreduce-client-core. (Hitesh Shah via vinodkv)
+
+ OPTIMAZATIONS
+
BUG FIXES
YARN-12. Fix findbugs warnings in FairScheduler. (Junping Du via acmurthy)
@@ -53,6 +62,8 @@ Release 0.23.3 - Unreleased
IMPROVEMENTS
+ OPTIMAZATIONS
+
BUG FIXES
YARN-14. Symlinks to peer distributed cache files no longer work
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
index d29edc1be25..c6300504f9f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
@@ -60,11 +60,6 @@
hadoop-yarn-server-common
test
-
- org.apache.hadoop
- hadoop-mapreduce-client-core
- test
-
org.apache.hadoop
hadoop-yarn-server-tests
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
index 68b1d0a1e60..e76e2db9f0f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDistributedShell.java
@@ -28,7 +28,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.util.JarFinder;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.server.MiniYARNCluster;