]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b79ed1c 05795cd)
Merge pull request #10359 from songbaisen/b11
authorYuri Weinstein <yuri.weinstein@gmail.com>
Thu, 20 Oct 2016 21:34:34 +0000 (14:34 -0700)
committerGitHub <noreply@github.com>
Thu, 20 Oct 2016 21:34:34 +0000 (14:34 -0700)
mon:  paxos add the timeout function when peon recovery

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
1  2 
src/mon/Paxos.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/Paxos.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.