]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2586 from ceph/wip-mon-status
authorSage Weil <sage@redhat.com>
Wed, 8 Oct 2014 19:39:01 +0000 (12:39 -0700)
committerSage Weil <sage@redhat.com>
Wed, 8 Oct 2014 19:39:01 +0000 (12:39 -0700)
mon: make health portion of ceph -s readable (multiple lines)

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
1  2 
src/mon/Monitor.cc
src/mon/Monitor.h
src/mon/OSDMonitor.cc
src/mon/PGMonitor.cc

Simple merge
Simple merge
Simple merge
Simple merge