Andrew Wang 56c0bd4d37 Merge from trunk to branch ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1610853 13f79535-47bb-0310-9956-ffa450edef68		2014-07-15 21:10:24 +00:00
..
main	Merge from trunk to branch	2014-07-15 21:10:24 +00:00
site	MAPREDUCE-5920. Add Xattr option in DistCp docs. Contributed by Yi Liu.	2014-06-11 18:36:06 +00:00
test	MAPREDUCE-5890. Support for encrypting Intermediate data and spills in local filesystem. (asuresh via tucu)	2014-07-11 00:43:03 +00:00