From: Sage Weil <sage@redhat.com>
Date: Fri, 29 Jan 2016 13:28:30 +0000 (-0500)
Subject: Merge pull request #7075 from shun-s/shun-fix
X-Git-Tag: v10.0.4~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71501a3ab4e67830a9f0e7338f5e8b1b4b8d06b1;p=ceph.git

Merge pull request #7075 from shun-s/shun-fix

global: do not start two daemons with a single pid-file

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

71501a3ab4e67830a9f0e7338f5e8b1b4b8d06b1