From: Sage Weil <sage@inktank.com>
Date: Thu, 15 Aug 2013 20:45:37 +0000 (-0700)
Subject: Merge pull request #501 from liewegas/wip-5906
X-Git-Tag: v0.68~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba8f16984e848a46c6d6c3037a1ff2dcf59f472a;p=ceph.git

Merge pull request #501 from liewegas/wip-5906

gussy up ceph -s

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

ba8f16984e848a46c6d6c3037a1ff2dcf59f472a
diff --cc src/mon/PGMap.h
index 465531335d39,35533f1594aa..00aa01ed07b4
--- a/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;