You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by dc...@apache.org on 2013/12/03 21:51:46 UTC
[1/2] git commit: updated refs/heads/master to 818ef4f
Updated Branches:
refs/heads/master 862d8ae43 -> 818ef4f9a
taking changes from 1.2 to stop service
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f75b8ab5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f75b8ab5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f75b8ab5
Branch: refs/heads/master
Commit: f75b8ab53a1868ad2c87a314059226efab018ded
Parents: 862d8ae
Author: dileepbapat <di...@gmail.com>
Authored: Tue May 14 18:08:08 2013 +0530
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Tue Dec 3 20:35:19 2013 +0100
----------------------------------------------------------------------
bin/couchdb.tpl.in | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f75b8ab5/bin/couchdb.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index 6ebacf4..538ebcb 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -304,6 +304,10 @@ stop_couchdb () {
PID=`_get_pid`
STOP_TIMEOUT=60
if test -n "$PID"; then
+ if test "$1" = "false"; then
+ echo > $PID_FILE
+ fi
+
if kill -0 $PID 2> /dev/null; then
if kill -TERM $PID 2> /dev/null; then
count=0
[2/2] git commit: updated refs/heads/master to 818ef4f
Posted by dc...@apache.org.
Merge branch '1795-fix-pidfile-race'
Patch via Dileep Bapat
https://github.com/dileepbapat/couchdb/commit/f90476074504058c81a6e73814266a5a0724fc55.patch
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/818ef4f9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/818ef4f9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/818ef4f9
Branch: refs/heads/master
Commit: 818ef4f9a263a6d9b8555521478327bc69fc9e2e
Parents: 862d8ae f75b8ab
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Tue Dec 3 20:43:12 2013 +0100
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Tue Dec 3 20:43:12 2013 +0100
----------------------------------------------------------------------
bin/couchdb.tpl.in | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------