Merge branch 'master' into sk-add_current_num_in_quota_info

diff --cc src/mon/OSDMonitor.cc
index 9755ac53d1ca36df1584303867fae28df6caa5d9,ed675e4d91ad6bf997ea99df3c4fe71b103687d3..5b3b8a1dfa3c9d58834f75486593a5ea8aa7034c
--- 1/src/mon/OSDMonitor.cc
--- 2/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@@ -4458,18 -5514,14 +5517,18 @@@ bool OSDMonitor::preprocess_command(Mon
           << "  max objects: ";
        if (p->quota_max_objects == 0)
          rs << "N/A";
 -      else
 +      else {
-         rs << si_t(p->quota_max_objects) << " objects\n";
+         rs << si_u_t(p->quota_max_objects) << " objects";
 +        rs << "  (current num objects: " << sum.num_objects << " objects)";
 +      }
        rs << "\n"
           << "  max bytes  : ";
        if (p->quota_max_bytes == 0)
          rs << "N/A";
 -      else
 +      else {
-         rs << si_t(p->quota_max_bytes) << " bytes";
+         rs << byte_u_t(p->quota_max_bytes);
 +        rs << "  (current num bytes: " << sum.num_bytes << " bytes)";
 +      }
        rdata.append(rs.str());
      }
      rdata.append("\n");