From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Mon, 1 Aug 2016 21:25:27 +0000 (-0700)
Subject: Merge pull request #10231 from yonghengdexin735/wip-zzz-paxosserver-type
X-Git-Tag: ses5-milestone5~241
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e08022f5666be5bb343393b24e45b95d37e11b28;p=ceph.git

Merge pull request #10231 from yonghengdexin735/wip-zzz-paxosserver-type

mon/PaxosService: make the return value type inconsistent

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

e08022f5666be5bb343393b24e45b95d37e11b28