Go to file
Vinod Kumar Vavilapalli 16841d50c5 YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1500994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500995 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 22:33:43 +00:00
dev-support HADOOP-9616. Fix branch-2 javadoc warnings. (Junping Du via llu) 2013-06-05 16:49:04 +00:00
hadoop-assemblies MAPREDUCE-5187. Merging change r1500929 from trunk to branch-2. 2013-07-08 20:28:55 +00:00
hadoop-client Set version in branch-2 to 2.2.0-SNAPSHOT. 2013-06-04 15:34:52 +00:00
hadoop-common-project HDFS-4860. Add additional attributes to JMX beans. Contributed by Trevor Lorimer 2013-07-05 21:40:46 +00:00
hadoop-dist Set version in branch-2 to 2.2.0-SNAPSHOT. 2013-06-04 15:34:52 +00:00
hadoop-hdfs-project HDFS-4860. Add additional attributes to JMX beans. Contributed by Trevor Lorimer 2013-07-05 21:40:46 +00:00
hadoop-mapreduce-project YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza. 2013-07-08 22:33:43 +00:00
hadoop-maven-plugins Set version in branch-2 to 2.2.0-SNAPSHOT. 2013-06-04 15:34:52 +00:00
hadoop-minicluster Set version in branch-2 to 2.2.0-SNAPSHOT. 2013-06-04 15:34:52 +00:00
hadoop-project HDFS-4762,HDFS-4948. Merging change r1499029,r1499041,r1499152 from trunk to branch-2 2013-07-03 03:55:42 +00:00
hadoop-project-dist Set version in branch-2 to 2.2.0-SNAPSHOT. 2013-06-04 15:34:52 +00:00
hadoop-tools HADOOP-9656. Merging change r1496597 from trunk to branch-2. 2013-06-25 19:26:48 +00:00
hadoop-yarn-project YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza. 2013-07-08 22:33:43 +00:00
.gitattributes HADOOP-8912. Merging changes 1397437 and 1397438 from trunk 2012-10-12 04:58:20 +00:00
.gitignore Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178 2011-12-08 19:30:53 +00:00
BUILDING.txt HADOOP-8562. Merge r1459586 for HDFS-4615, r1459592 for HDFS-4584, r1459643, r1459642 for HADOOP-9387, r1460086 for HADOOP-9353 2013-05-24 05:12:56 +00:00
pom.xml Set version in branch-2 to 2.2.0-SNAPSHOT. 2013-06-04 15:34:52 +00:00