From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 30 Oct 2019 16:06:08 +0000 (-0400)
Subject: Merge pull request #30994 from JackSlateur/rbd_merged_du
X-Git-Tag: v15.1.0~1109
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b50e6f5894a20703b073739bdd075de5a7bdc0d4;p=ceph.git

Merge pull request #30994 from JackSlateur/rbd_merged_du

rbd: add --merge to disk-usage

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

b50e6f5894a20703b073739bdd075de5a7bdc0d4