diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-06-08 11:55:32 -0700 |
| commit | adfb79a9bbdfb43f35c0f022c1de6118b10ce115 (patch) | |
| tree | e14ec0cc5161cfd5cc321eaaa5b8eed07df952de /scripts/stopdaemons.sh | |
| parent | 1a126032efbcb265a59f4d682bd072251f857c97 (diff) | |
| parent | 265e2bd58de2a01e0d7840310eb44b21b70e3914 (diff) | |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
classes/Profile.php
lib/common.php
lib/util.php
scripts/getvaliddaemons.php
scripts/stopdaemons.sh
Diffstat (limited to 'scripts/stopdaemons.sh')
| -rwxr-xr-x | scripts/stopdaemons.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh index 764037e8f..2134b4ab0 100755 --- a/scripts/stopdaemons.sh +++ b/scripts/stopdaemons.sh @@ -24,8 +24,7 @@ SDIR=`dirname $0` DIR=`php $SDIR/getpiddir.php` for f in jabberhandler ombhandler publichandler smshandler pinghandler \ - xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \ - memcachehandler inboxhandler twitterstatusfetcher; do + xmppconfirmhandler xmppdaemon twitterhandler facebookhandler; do FILES="$DIR/$f.*.pid" for ff in "$FILES" ; do |