You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/04/27 23:26:47 UTC
[44/50] [abbrv] hadoop git commit: HADOOP-11865. Incorrect path
mentioned in document for accessing script files (J.Andreina via aw)
HADOOP-11865. Incorrect path mentioned in document for accessing script files (J.Andreina via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c0992223
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c0992223
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c0992223
Branch: refs/heads/YARN-2928
Commit: c09922237d2a9391950f74150d58dd607d7c4694
Parents: 7dc1af5
Author: Allen Wittenauer <aw...@apache.org>
Authored: Sun Apr 26 09:55:46 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Apr 27 14:18:53 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm | 2 +-
.../hadoop-hdfs/src/site/markdown/HdfsUserGuide.md | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0992223/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 826c77e..5ba71a4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -445,6 +445,9 @@ Trunk (Unreleased)
HADOOP-11797. releasedocmaker.py needs to put ASF headers on output (aw)
+ HADOOP-11865. Incorrect path mentioned in document for accessing script
+ files (J.Andreina via aw)
+
OPTIMIZATIONS
HADOOP-7761. Improve the performance of raw comparisons. (todd)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0992223/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
index 44b5bfb..ad4bfca 100644
--- a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
+++ b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
@@ -101,7 +101,7 @@ The Aggregation interval is configured via the property :
$H3 Start/Stop the KMS
-To start/stop KMS use KMS's bin/kms.sh script. For example:
+To start/stop KMS use KMS's sbin/kms.sh script. For example:
hadoop-${project.version} $ sbin/kms.sh start
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c0992223/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
index ffd8532..54197a5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsUserGuide.md
@@ -307,7 +307,7 @@ When Hadoop is upgraded on an existing cluster, as with any software upgrade, it
* Stop the cluster and distribute new version of Hadoop.
-* Run the new version with `-upgrade` option (`bin/start-dfs.sh -upgrade`).
+* Run the new version with `-upgrade` option (`sbin/start-dfs.sh -upgrade`).
* Most of the time, cluster works just fine. Once the new HDFS is
considered working well (may be after a few days of operation),
@@ -319,7 +319,7 @@ When Hadoop is upgraded on an existing cluster, as with any software upgrade, it
* stop the cluster and distribute earlier version of Hadoop.
- * start the cluster with rollback option. (`bin/start-dfs.sh -rollback`).
+ * start the cluster with rollback option. (`sbin/start-dfs.sh -rollback`).
When upgrading to a new version of HDFS, it is necessary to rename or delete any paths that are reserved in the new version of HDFS. If the NameNode encounters a reserved path during upgrade, it will print an error like the following: