Siddharth Seth 68f136337d Merge MAPREDUCE-4144 from trunk. Fix a NPE in the ResourceManager when handling node updates. (Contributed by Jason Lowe) ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325993 13f79535-47bb-0310-9956-ffa450edef68		2012-04-13 22:26:07 +00:00
dev-support	Merge -r 1220809:1220810 from trunk to branch. FIXES: HDFS-2658	2011-12-19 15:56:57 +00:00
hadoop-assemblies	svn merge -c 1308925 from trunk. FIXES MAPREDUCE-4060. Multiple SLF4J binding warning (Jason Lowe via bobby)	2012-04-03 14:21:02 +00:00
hadoop-client	Changed version in branch-2 to 2.0.0-SNAPSHOT.	2012-03-28 07:25:51 +00:00
hadoop-common-project	svn merge -c 1325500 from trunk. FIXES: HADOOP-7510. Tokens should use original hostname provided instead of ip (Daryn Sharp via bobby)	2012-04-12 20:45:51 +00:00
hadoop-dist	Changed version in branch-2 to 2.0.0-SNAPSHOT.	2012-03-28 07:25:51 +00:00
hadoop-hdfs-project	HDFS-2799. svn merge -c 1325963 from trunk	2012-04-13 21:41:16 +00:00
hadoop-mapreduce-project	Merge MAPREDUCE-4144 from trunk. Fix a NPE in the ResourceManager when handling node updates. (Contributed by Jason Lowe)	2012-04-13 22:26:07 +00:00
hadoop-minicluster	Changed version in branch-2 to 2.0.0-SNAPSHOT.	2012-03-28 07:25:51 +00:00
hadoop-project	merge -r 1310035:1310036 from trunk. FIXES: HADOOP-8180	2012-04-05 19:40:04 +00:00
hadoop-project-dist	Changed version in branch-2 to 2.0.0-SNAPSHOT.	2012-03-28 07:25:51 +00:00
hadoop-tools	svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)	2012-04-13 13:46:45 +00:00
.gitignore	Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178	2011-12-08 19:30:53 +00:00
BUILDING.txt	Merged r1294293 from trunk for HDFS-8113.	2012-03-01 00:56:55 +00:00
pom.xml	Changed version in branch-2 to 2.0.0-SNAPSHOT.	2012-03-28 07:25:51 +00:00