svn merge -c 1325069 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325070 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 23:59:20 +00:00 · 2012-04-11 23:59:20 +00:00 · d64a8d3e2c
parent d31abfe3f8
commit d64a8d3e2c
2 changed files with 3 additions and 2 deletions
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@ -230,6 +230,9 @@ Release 2.0.0 - UNRELEASED
    HADOOP-8264. Remove irritating double double quotes in front of hostname
    (Bernd Fondermann via bobby)

+    HADOOP-8270. hadoop-daemon.sh stop action should return 0 for an
+    already stopped service. (Roman Shaposhnik via eli)
+
  BREAKDOWN OF HADOOP-7454 SUBTASKS

    HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
@ -167,11 +167,9 @@ case $startStop in
        kill `cat $pid`
      else
        echo no $command to stop
-        exit 1
      fi
    else
      echo no $command to stop
-      exit 1
    fi
    ;;