svn merge -c 1511464 FIXES: MAPREDUCE-5425. Junit in TestJobHistoryServer failing in jdk 7. Contributed by Robert Parker


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1531029 13f79535-47bb-0310-9956-ffa450edef68
YARN-155. TestAppManager intermittently fails with jdk7. Contributed by Thomas Graves


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1531032 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1377943 FIXES: MAPREDUCE-4579. Split TestTaskAttempt into two so as to pass tests on jdk7. Contributed by Thomas Graves


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1531047 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1520964 FIXES: MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE. Contributed by Nemon Lou


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