From: Sage Weil <sage@redhat.com>
Date: Sat, 27 Apr 2019 15:41:18 +0000 (-0500)
Subject: Merge PR #18694 into master
X-Git-Tag: v15.1.0~2810
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cf452946865731c50fc195af681554222af0cefb;p=ceph-ci.git

Merge PR #18694 into master

* refs/pull/18694/head:
	Merge branch 'master' into sk-add_current_num_in_quota_info
	mon/OSDMonitor.cc: Add current numbers of objects and bytes

Reviewed-by: Sage Weil <sage@redhat.com>
---

cf452946865731c50fc195af681554222af0cefb