Andrew Wang beebb36595 Fix some merge errors that slipped through. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615013 13f79535-47bb-0310-9956-ffa450edef68		2014-07-31 22:45:08 +00:00
..
dev-support	HDFS-6167. Relocate the non-public API classes in the hdfs.client package.	2014-04-02 05:09:35 +00:00
src	Fix some merge errors that slipped through.	2014-07-31 22:45:08 +00:00
CHANGES-fs-encryption.txt	HDFS-6785. Should not be able to create encryption zone using path to a non-directory file. (clamb)	2014-07-30 20:00:24 +00:00
CHANGES.txt	HDFS-6778. The extended attributes javadoc should simply refer to the user docs. Contributed by Charles Lamb.	2014-07-30 05:57:55 +00:00
LICENSE.txt	HDFS-4385. Maven RAT plugin is not checking all source files (tgraves)	2013-01-14 14:36:40 +00:00
NOTICE.txt
pom.xml	Merge from trunk to branch	2014-07-15 21:10:24 +00:00