]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4936 from ceph/wip-11975-hammer
authorKefu Chai <tchaikov@gmail.com>
Fri, 10 Jul 2015 07:59:35 +0000 (15:59 +0800)
committerKefu Chai <tchaikov@gmail.com>
Fri, 10 Jul 2015 07:59:35 +0000 (15:59 +0800)
mon crashes when "ceph osd tree 85 --format json"

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

Simple merge