Andrew Wang cb20bb6117 Merge from trunk to branch ...

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612403 13f79535-47bb-0310-9956-ffa450edef68

2014-07-21 21:44:50 +00:00

..

.eclipse.templates

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

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

bin

HADOOP-9921. daemon scripts should remove pid file on stop call after stop or process is found not running ( Contributed by Vinayakumar B)

2014-07-16 10:48:15 +00:00

conf

HADOOP-10040. Revert svn propset for CRLF line endings on Windows files. Contributed by Chris Nauroth.

2013-10-14 17:01:33 +00:00

dev-support

MAPREDUCE-5844. Add a configurable delay to reducer-preemption. (Maysam Yabandeh via kasha)

2014-06-19 17:22:56 +00:00

hadoop-mapreduce-client

Merge from trunk to branch

2014-07-21 21:44:50 +00:00

hadoop-mapreduce-examples

MAPREDUCE-5886. Allow wordcount example job to accept multiple input paths. Contributed by Chris Nauroth.

2014-06-10 17:48:52 +00:00

lib/jdiff

JDiff output for release 0.22.0

2011-12-12 05:45:08 +00:00

.gitignore

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

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

CHANGES-fs-encryption.txt

MAPREDUCE-5890. Support for encrypting Intermediate data and spills in local filesystem. (asuresh via tucu)

2014-07-11 00:43:03 +00:00

CHANGES.txt

MAPREDUCE-5756. CombineFileInputFormat.getSplits() including directories in its results. Contributed by Jason Dere

2014-07-21 21:24:15 +00:00

INSTALL

YARN-1229. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.

2013-09-25 00:35:03 +00:00

LICENSE.txt

MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)

2014-05-13 19:10:48 +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

MAPREDUCE-5652. NM Recovery. ShuffleHandler should handle NM restarts. (Jason Lowe via kasha)

2014-05-13 19:10:48 +00:00