]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #10491 from xiexingguo/xxg-wip-osdmon-2016-07-28
authorYuri Weinstein <yuri.weinstein@gmail.com>
Fri, 5 Aug 2016 15:14:02 +0000 (08:14 -0700)
committerGitHub <noreply@github.com>
Fri, 5 Aug 2016 15:14:02 +0000 (08:14 -0700)
osd/OSDMonitor: misc. fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/mon/OSDMonitor.cc

Simple merge