]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd9489d1ad656f47ae7f7d0cba4cd5cedc7fd6457
treed6d36957342e70774ae08f7bfa4fc2d53cd0052btree | snapshot
parentb79ed1c2bd562c011485fa61db0672e91d663d35commit | diff
parent05795cd7f3db4e0cb2db3a34993db10c2aede1b3commit | diff
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>
src/mon/Paxos.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.