]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #15390 from liewegas/wip-osdmap-state
authorSage Weil <sage@newdream.net>
Tue, 6 Jun 2017 18:19:18 +0000 (13:19 -0500)
committerGitHub <noreply@github.com>
Tue, 6 Jun 2017 18:19:18 +0000 (13:19 -0500)
osd/OSDMap: make osd_state 32 bits wide

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc
src/osd/OSDMap.h

Simple merge
Simple merge
Simple merge