Author: wang
Date: Wed Jul 23 20:45:10 2014
New Revision: 1612941
URL: http://svn.apache.org/r1612941
Log:
Merge from trunk to branch pt 2
Modified:
hadoop/common/branches/fs-encryption/ (props changed)
hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml
Propchange: hadoop/common/branches/fs-encryption/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1612403-1612915
Modified: hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml?rev=1612941&r1=1612940&r2=1612941&view=diff
==============================================================================
--- hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml
(original)
+++ hadoop/common/branches/fs-encryption/hadoop-project/src/site/site.xml Wed
Jul 23 20:45:10 2014
@@ -89,6 +89,7 @@
<item name="HDFS NFS Gateway"
href="hadoop-project-dist/hadoop-hdfs/HdfsNfsGateway.html"/>
<item name="HDFS Rolling Upgrade"
href="hadoop-project-dist/hadoop-hdfs/HdfsRollingUpgrade.html"/>
<item name="Extended Attributes"
href="hadoop-project-dist/hadoop-hdfs/ExtendedAttributes.html"/>
+ <item name="HDFS Support for Multihoming"
href="hadoop-project-dist/hadoop-hdfs/HdfsMultihoming.html"/>
</menu>
<menu name="MapReduce" inherit="top">
