Thomas Graves 0d388cd1f4 merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621 ...

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

2012-04-05 20:13:11 +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 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621

2012-04-05 20:13:11 +00:00

hadoop-mapreduce-examples

merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621

2012-04-05 20:13:11 +00:00

hadoop-yarn

merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621

2012-04-05 20:13:11 +00:00

ivy

…

lib/jdiff

…

src

merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621

2012-04-05 20:13:11 +00:00

.gitignore

…

build-utils.xml

…

build.xml

…

CHANGES.txt

merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621

2012-04-05 20:13:11 +00:00

INSTALL

…

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

…

NOTICE.txt

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

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

pom.xml

merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621

2012-04-05 20:13:11 +00:00