Arun Murthy c09246b2e8 Fixed broken merge for MAPREDUCE-2987 ...

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

2011-09-17 07:16:47 +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

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

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

bin

Merge -r 1162187:1162188 from trunk to branch-0.23 to fix MAPREDUCE-2885.

2011-08-26 17:58:13 +00:00

conf

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

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

dev-support

Merge -r 1166837:1166838 from trunk to branch-0.23 to fix MAPREDUCE-2908.

2011-09-08 18:28:14 +00:00

hadoop-mapreduce-client

Fixed broken merge for MAPREDUCE-2987

2011-09-17 07:16:47 +00:00

hadoop-yarn

Merge -r 1171900:1171901 from trunk to branch-0.23 to fix MAPREDUCE-2987.

2011-09-17 05:53:28 +00:00

ivy

MAPREDUCE-2916. Ivy build for MRv1 fails with bad organization for common daemon. (mahadev) - merge r1163490 from trunk

2011-08-31 05:51:58 +00:00

lib/jdiff

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

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

src

MAPREDUCE-2991. queueinfo.jsp fails if queue names contain special symbols. Contributed by Priyo Mustafi.

2011-09-15 01:49:05 +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

MAPREDUCE-2767. Remove Linux task-controller from 0.23 branch. Contributed by Milind Bhandarkar.

2011-09-06 22:36:28 +00:00

CHANGES.txt

Merge -r 1171900:1171901 from trunk to branch-0.23 to fix MAPREDUCE-2987.

2011-09-17 05:53:28 +00:00

INSTALL

Merge -r 1166954:1166955 from trunk to branch-0.23 to fix MAPREDUCE-2864.

2011-09-09 01:58:40 +00:00

ivy.xml

merge 1161782 from trunk

2011-08-25 23:09:10 +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

HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm)

2011-09-01 17:24:05 +00:00