]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #10231 from yonghengdexin735/wip-zzz-paxosserver-type
authorYuri Weinstein <yuri.weinstein@gmail.com>
Mon, 1 Aug 2016 21:25:27 +0000 (14:25 -0700)
committerGitHub <noreply@github.com>
Mon, 1 Aug 2016 21:25:27 +0000 (14:25 -0700)
mon/PaxosService: make the return value type inconsistent

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/mon/OSDMonitor.cc
src/mon/PaxosService.cc
src/tools/rados/rados.cc

Simple merge
Simple merge
Simple merge