Author: arp
Date: Tue Jan 28 06:42:51 2014
New Revision: 1561952
URL: http://svn.apache.org/r1561952
Log:
HADOOP-9830. Merging r1561951 from trunk to branch-2
Modified:
hadoop/common/branches/branch-2/hadoop-project/src/site/apt/index.apt.vm
Modified:
hadoop/common/branches/branch-2/hadoop-project/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/src/site/apt/index.apt.vm?rev=1561952&r1=1561951&r2=1561952&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/src/site/apt/index.apt.vm
(original)
+++ hadoop/common/branches/branch-2/hadoop-project/src/site/apt/index.apt.vm
Tue Jan 28 06:42:51 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.