Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-9830. Merging r1561951 from trunk to branch-2 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561952 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Agarwal 2014-01-28 06:42:51 +00:00
parent 17acadd167
commit 152f1b17c6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -365,6 +365,9 @@ Release 2.3.0 - UNRELEASED
HADOOP-10212. Incorrect compile command in Native Library document. HADOOP-10212. Incorrect compile command in Native Library document.
(Akira Ajisaka via Arpit Agarwal) (Akira Ajisaka via Arpit Agarwal)
HADOOP-9830. Fix typo at http://hadoop.apache.org/docs/current/
(Kousuke Saruta via Arpit Agarwal)
Release 2.2.0 - 2013-10-13 Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-project/src/site/apt/index.apt.vm
View File

@ -45,7 +45,7 @@ Apache Hadoop ${project.version}
The new ResourceManager manages the global assignment of compute resources to The new ResourceManager manages the global assignment of compute resources to
applications and the per-application ApplicationMaster manages the 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 An application is either a single job in the sense of classic MapReduce jobs
or a DAG of such jobs. or a DAG of such jobs.