svn commit: r1562670 - in /hadoop/common/branches/HDFS-4685: ./ hadoop-project/src/site/apt/index.apt.vm hadoop-project/src/site/site.xml

[cnauroth]

Author: cnauroth
Date: Thu Jan 30 01:55:14 2014
New Revision: 1562670

URL: http://svn.apache.org/r1562670
Log:
Merge trunk to HDFS-4685.

Modified:
    hadoop/common/branches/HDFS-4685/   (props changed)
    hadoop/common/branches/HDFS-4685/hadoop-project/src/site/apt/index.apt.vm
    hadoop/common/branches/HDFS-4685/hadoop-project/src/site/site.xml

Propchange: hadoop/common/branches/HDFS-4685/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1561770-1562668

Modified: 
hadoop/common/branches/HDFS-4685/hadoop-project/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-project/src/site/apt/index.apt.vm?rev=1562670&r1=1562669&r2=1562670&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4685/hadoop-project/src/site/apt/index.apt.vm 
(original)
+++ hadoop/common/branches/HDFS-4685/hadoop-project/src/site/apt/index.apt.vm 
Thu Jan 30 01:55:14 2014
@@ -45,7 +45,7 @@ Apache Hadoop ${project.version}
 
   The new ResourceManager manages the global assignment of compute resources 
to 
   applications and the per-application ApplicationMaster manages the 
-  application’s scheduling and coordination. 
+  application‚ scheduling and coordination. 
 
   An application is either a single job in the sense of classic MapReduce jobs 
   or a DAG of such jobs. 

Modified: hadoop/common/branches/HDFS-4685/hadoop-project/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-project/src/site/site.xml?rev=1562670&r1=1562669&r2=1562670&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4685/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-4685/hadoop-project/src/site/site.xml Thu Jan 
30 01:55:14 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>