Alejandro Abdelnur 4bdf14f6c9 Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098 ...

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

2012-04-04 14:57:41 +00:00

..

.eclipse.templates

HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.

2011-08-25 00:14:24 +00:00

assembly

Merge -r 1182150:1182151 from trunk to branch. FIXES: HADOOP-7642

2011-10-28 21:57:38 +00:00

bin

MAPREDUCE-3989. svn merge -c 1307102 from trunk

2012-03-29 20:55:21 +00:00

conf

MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev) - Merging r1208131 from trunk.

2011-11-29 23:28:16 +00:00

dev-support

Merge -c 1182008 from trunk to branch-0.23 to fix MAPREDUCE-3126.

2011-10-11 18:30:00 +00:00

hadoop-mapreduce-client

Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098

2012-04-04 14:57:41 +00:00

hadoop-mapreduce-examples

Changed version in branch-2 to 2.0.0-SNAPSHOT.

2012-03-28 07:25:51 +00:00

hadoop-yarn

merge -r 1309132:1309133 from trunk. FIXES: MAPREDUCE-4020

2012-04-03 20:41:22 +00:00

ivy

Changed version in branch-2 to 2.0.0-SNAPSHOT.

2012-03-28 07:25:51 +00:00

lib/jdiff

JDiff output for release 0.22.0

2011-12-12 05:47:46 +00:00

src

svn merge -c 1308957 from trunk. FIXES MAPREDUCE-3983. TestTTResourceReporting can fail, and should just be deleted (Ravi Prakash via bobby)

2012-04-03 14:49:01 +00:00

.gitignore

HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.

2011-08-25 00:14:24 +00:00

build-utils.xml

HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.

2011-08-25 00:14:24 +00:00

build.xml

Changed version in branch-2 to 2.0.0-SNAPSHOT.

2012-03-28 07:25:51 +00:00

CHANGES.txt

Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098

2012-04-04 14:57:41 +00:00

INSTALL

Merge -c 1241250 from trunk to branch-0.23 to fix MAPREDUCE-3354. Changed scripts so that jobhistory server is started by bin/mapred instead of bin/yarn. Contributed by Jonathan Eagles.

2012-02-06 23:13:16 +00:00

ivy.xml

MAPREDUCE-3705. ant build fails on 0.23 branch. (Thomas Graves via mahadev)

2012-01-21 01:17:43 +00:00

LICENSE.txt

HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.

2011-08-25 00:14:24 +00:00

NOTICE.txt

HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.

2011-08-25 00:14:24 +00:00

pom.xml

Changed version in branch-2 to 2.0.0-SNAPSHOT.

2012-03-28 07:25:51 +00:00