Andrew Wang 834fccf02b Merge from trunk to branch ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619194 13f79535-47bb-0310-9956-ffa450edef68		2014-08-20 18:19:13 +00:00
..
apt	Merge from trunk to branch	2014-08-20 18:19:13 +00:00
resources	HDFS-6138. Add a user guide for how to use viewfs with federation. Contributed by sanjay and szetszwo	2014-03-21 18:47:30 +00:00
xdoc	HDFS-6620. Snapshot docs should specify about preserve options with cp command. Contributed by Stephen Chu.	2014-07-03 16:08:44 +00:00
site.xml	Add new files missed from HADOOP-8860 commit.	2012-11-12 13:54:27 +00:00