From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 28 Aug 2015 15:45:25 +0000 (+0800)
Subject: Merge pull request #5453 from wonzhq/recover-primary
X-Git-Tag: v9.1.0~280
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c86b8e699eb9d8e3f23182452e173957c74e71c;p=ceph.git

Merge pull request #5453 from wonzhq/recover-primary

osd: recovery fixes

Reviewed-by: Sage Weil <sage@redhat.com>
---

9c86b8e699eb9d8e3f23182452e173957c74e71c