From: Kefu Chai Date: Thu, 17 Sep 2015 10:52:54 +0000 (+0800) Subject: Merge pull request #5870 from s09816/master X-Git-Tag: v9.1.0~129 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e8e0e7bb55eed6d09b1c10fb5171a26e5fab4e4;p=ceph.git Merge pull request #5870 from s09816/master osd:the fuction osd::shutdown Lock failed. Reviewed-by: Kefu Chai --- 6e8e0e7bb55eed6d09b1c10fb5171a26e5fab4e4