From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 14 Jan 2016 10:21:15 +0000 (+0800)
Subject: Merge pull request #7227 from dwj192/dwj-paxos
X-Git-Tag: v10.0.3~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd305c813e167525e5c0680f25232e4dad937387;p=ceph.git

Merge pull request #7227 from dwj192/dwj-paxos

mon: paxos is_recovering calc error

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

fd305c813e167525e5c0680f25232e4dad937387