]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #30994 from JackSlateur/rbd_merged_du
authorJason Dillaman <dillaman@redhat.com>
Wed, 30 Oct 2019 16:06:08 +0000 (12:06 -0400)
committerGitHub <noreply@github.com>
Wed, 30 Oct 2019 16:06:08 +0000 (12:06 -0400)
commitb50e6f5894a20703b073739bdd075de5a7bdc0d4
tree0cad6dbe6f787ccb17e3b1f1e70c32f7814e788d
parent5df72239857e4bd32e6a5fd4d752156e4d8bcec3
parent79d545c006875a153d5e942a1cb7f00a485cb0a3
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>
doc/man/8/rbd.rst