From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Thu, 20 Oct 2016 21:34:34 +0000 (-0700)
Subject: Merge pull request #10359 from songbaisen/b11
X-Git-Tag: v11.1.0~558
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9489d1ad656f47ae7f7d0cba4cd5cedc7fd6457;p=ceph.git

Merge pull request #10359 from songbaisen/b11

mon:  paxos add the timeout function when peon recovery

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
---

d9489d1ad656f47ae7f7d0cba4cd5cedc7fd6457