Merge pull request #501 from liewegas/wip-5906

gussy up ceph -s

Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --cc src/mon/PGMap.cc
Simple merge

diff --cc src/mon/PGMap.h
index 465531335d399d0819bdb21591f2fffb8005d316,35533f1594aad2fd107b8108a977ff5865f2238f..00aa01ed07b4a5e5a1b74057a68b7f2eff290d42
--- 1/src/mon/PGMap.h
--- 2/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@@ -168,11 -168,10 +168,13 @@@ public
  
    void dump(ostream& ss) const;
  
 +  void dump_osd_perf_stats(Formatter *f) const;
 +  void print_osd_perf_stats(std::ostream *ss) const;
 +
    void recovery_summary(Formatter *f, ostream *out) const;
+   void recovery_rate_summary(Formatter *f, ostream *out) const;
    void print_summary(Formatter *f, ostream *out) const;
+   void print_oneline_summary(ostream *out) const;
  
    epoch_t calc_min_last_epoch_clean() const;