svn commit: r1562964 - in /hadoop/common/branches/HDFS-5698: ./ hadoop-project/src/site/apt/index.apt.vm

[jing9]

Author: jing9
Date: Thu Jan 30 21:11:21 2014
New Revision: 1562964

URL: http://svn.apache.org/r1562964
Log:
Merging r1561802 through r1562961 from trunk.

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

Propchange: hadoop/common/branches/HDFS-5698/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1561802-1562961

Modified: 
hadoop/common/branches/HDFS-5698/hadoop-project/src/site/apt/index.apt.vm
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-project/src/site/apt/index.apt.vm?rev=1562964&r1=1562963&r2=1562964&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-project/src/site/apt/index.apt.vm 
(original)
+++ hadoop/common/branches/HDFS-5698/hadoop-project/src/site/apt/index.apt.vm 
Thu Jan 30 21:11:21 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.