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

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
This commit is contained in:
Eli Collins 2012-04-11 23:59:20 +00:00
parent d31abfe3f8
commit d64a8d3e2c
2 changed files with 3 additions and 2 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

@ -230,6 +230,9 @@ Release 2.0.0 - UNRELEASED
HADOOP-8264. Remove irritating double double quotes in front of hostname HADOOP-8264. Remove irritating double double quotes in front of hostname
(Bernd Fondermann via bobby) (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 BREAKDOWN OF HADOOP-7454 SUBTASKS
HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh) HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)

2
hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
View File

@ -167,11 +167,9 @@ case $startStop in
kill `cat $pid` kill `cat $pid`
else else
echo no $command to stop echo no $command to stop
exit 1
fi fi
else else
echo no $command to stop echo no $command to stop
exit 1
fi fi
;; ;;