HDFS-8226. Non-HA rollback compatibility broken (Contributed by J.Andreina) Added one missed change, missed while resolving conflict
(cherry picked from commit 3ee1b50dad9604bd959adbae472813f4bdf2fec7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1fbefe58 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1fbefe58 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1fbefe58 Branch: refs/heads/branch-2.7 Commit: 1fbefe586b35e581f2c4610cd8e010e27e782bc3 Parents: 99309a9 Author: Vinayakumar B <vinayakum...@apache.org> Authored: Fri May 8 15:39:47 2015 +0530 Committer: Vinayakumar B <vinayakum...@apache.org> Committed: Fri May 8 15:42:17 2015 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1fbefe58/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh index c46e625..a8c2b98 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh @@ -41,7 +41,8 @@ if [[ $# -ge 1 ]]; then dataStartOpt="$startOpt" ;; *) - hadoop_exit_with_usage 1 + echo $usage + exit 1 ;; esac fi