]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23471 into master
authorSage Weil <sage@redhat.com>
Thu, 9 Aug 2018 19:35:56 +0000 (14:35 -0500)
committerSage Weil <sage@redhat.com>
Thu, 9 Aug 2018 19:35:56 +0000 (14:35 -0500)
* refs/pull/23471/head:
mon/PGMap: fix spacing around pretty-printed SI units
include/types: render SI units adjacent to number

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>

Trivial merge