Author: szetszwo
Date: Tue Jan 28 05:37:13 2014
New Revision: 1561944
URL: http://svn.apache.org/r1561944
Log:
Merge r1555021 through r1561943 from trunk.
Modified:
hadoop/common/branches/HDFS-5535/ (props changed)
hadoop/common/branches/HDFS-5535/hadoop-project/src/site/site.xml
Propchange: hadoop/common/branches/HDFS-5535/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1561511-1561943
Modified: hadoop/common/branches/HDFS-5535/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-project/src/site/site.xml?rev=1561944&r1=1561943&r2=1561944&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-project/src/site/site.xml Tue Jan
28 05:37:13 2014
@@ -59,6 +59,7 @@
<item name="CLI Mini Cluster"
href="hadoop-project-dist/hadoop-common/CLIMiniCluster.html"/>
<item name="Native Libraries"
href="hadoop-project-dist/hadoop-common/NativeLibraries.html"/>
<item name="Superusers"
href="hadoop-project-dist/hadoop-common/Superusers.html"/>
+ <item name="Secure Mode"
href="hadoop-project-dist/hadoop-common/SecureMode.html"/>
<item name="Service Level Authorization"
href="hadoop-project-dist/hadoop-common/ServiceLevelAuth.html"/>
<item name="HTTP Authentication"
href="hadoop-project-dist/hadoop-common/HttpAuthentication.html"/>
</menu>