svn merge -c 1579995 merging from trunk to branch-2 to fix:MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout. Contributed by Mit Desai.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -21,6 +21,9 @@ Release 2.5.0 - UNRELEASED
     MAPREDUCE-5456. TestFetcher.testCopyFromHostExtraBytes is missing (Jason
     Lowe via jeagles)
 
+    MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout (Mit Desai
+    via kihwal)
+
   OPTIMIZATIONS
 
   BUG FIXES 

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java

@@ -104,7 +104,7 @@ public class TestMRJobsWithProfiler {
   }
 
 
-  @Test (timeout = 120000)
+  @Test (timeout = 150000)
   public void testProfiler() throws IOException, InterruptedException,
       ClassNotFoundException {
     if (!(new File(MiniMRYarnCluster.APPJAR)).exists()) {