Repository: hadoop Updated Branches: refs/heads/branch-2 6cd767287 -> 01e5de912
HADOOP-11955. Fix a typo in the cluster setup doc. Contributed by Yanjun Wang. (cherry picked from commit b2a40942c1bf19d19756443267107d3cfa39b53b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/01e5de91 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/01e5de91 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/01e5de91 Branch: refs/heads/branch-2 Commit: 01e5de9120b9f9676c9ba0c73fa4ddceb1248a9c Parents: 6cd7672 Author: Akira Ajisaka <[email protected]> Authored: Fri May 22 16:09:01 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Fri May 22 16:09:24 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/site/markdown/ClusterSetup.md | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/01e5de91/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 681b4b8..2627e7f 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -275,6 +275,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12014. hadoop-config.cmd displays a wrong error message. (Kengo Seki via aajisaka) + HADOOP-11955. Fix a typo in the cluster setup doc. + (Yanjun Wang via aajisaka) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/01e5de91/hadoop-common-project/hadoop-common/src/site/markdown/ClusterSetup.md ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/ClusterSetup.md b/hadoop-common-project/hadoop-common/src/site/markdown/ClusterSetup.md index 2865716..2ba56e6 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/ClusterSetup.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/ClusterSetup.md @@ -66,7 +66,7 @@ Additionally, you can control the Hadoop scripts found in the bin/ directory of To configure the Hadoop cluster you will need to configure the `environment` in which the Hadoop daemons execute as well as the `configuration parameters` for the Hadoop daemons. -HDFS daemons are NameNode, SecondaryNameNode, and DataNode. YARN damones are ResourceManager, NodeManager, and WebAppProxy. If MapReduce is to be used, then the MapReduce Job History Server will also be running. For large installations, these are generally running on separate hosts. +HDFS daemons are NameNode, SecondaryNameNode, and DataNode. YARN daemons are ResourceManager, NodeManager, and WebAppProxy. If MapReduce is to be used, then the MapReduce Job History Server will also be running. For large installations, these are generally running on separate hosts. ### Configuring Environment of Hadoop Daemons
