Andrew Wang 311d2f0773 Merge from trunk to branch. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616589 13f79535-47bb-0310-9956-ffa450edef68		2014-08-07 20:26:52 +00:00
..
src	Merge from trunk to branch.	2014-08-07 20:26:52 +00:00
pom.xml	MAPREDUCE-5554. hdfs-site.xml included in hadoop-mapreduce-client-jobclient tests jar is breaking tests for downstream components (Robert Kanter via Sandy Ryza)	2013-10-02 21:53:57 +00:00