Chris Nauroth 9df555d193 HDFS-6570. Merging change r1614723 from trunk to branch-2. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614726 13f79535-47bb-0310-9956-ffa450edef68		2014-07-30 17:54:35 +00:00
..
apt	HDFS-6570. Merging change r1614723 from trunk to branch-2.	2014-07-30 17:54:35 +00:00
resources	svn merge -c 1580013 from trunk for HDFS-6138. Add a user guide for how to use viewfs with federation.	2014-03-21 18:48:34 +00:00
xdoc	Merge from trunk. HDFS-6620. Snapshot docs should specify about preserve options with cp command. Contributed by Stephen Chu.	2014-07-03 16:12:23 +00:00
site.xml	Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.	2012-11-12 13:57:19 +00:00