Merge -r 1325572:1325573 from trunk to branch-2. Fixes: MAPREDUCE-4147

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325574 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -137,6 +137,9 @@ Release 2.0.0 - UNRELEASED
     MAPREDUCE-4107. Fix tests in org.apache.hadoop.ipc.TestSocketFactory
     (Devaraj K via tgraves)
 
+    MAPREDUCE-4147. YARN should not have a compile-time dependency on HDFS.
+    (tomwhite)
+
 Release 0.23.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/pom.xml

@@ -123,7 +123,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>