]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26917 into master
authorSage Weil <sage@redhat.com>
Wed, 13 Mar 2019 11:55:58 +0000 (06:55 -0500)
committerSage Weil <sage@redhat.com>
Wed, 13 Mar 2019 11:55:58 +0000 (06:55 -0500)
* refs/pull/26917/head:
osd/osd_types: include omap and hit_set_archive bytes in pool usage

Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge