From: Sage Weil <sage@redhat.com>
Date: Thu, 9 Aug 2018 19:35:56 +0000 (-0500)
Subject: Merge PR #23471 into master
X-Git-Tag: v14.0.1~635
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ebaa80690d6d795bebbe8c97e0a0057d05f6900c;p=ceph.git

Merge PR #23471 into master

* 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>
---

ebaa80690d6d795bebbe8c97e0a0057d05f6900c