From: Sage Weil <sage@redhat.com>
Date: Sun, 24 Mar 2019 15:28:59 +0000 (-0500)
Subject: Merge PR #27117 into nautilus
X-Git-Tag: v14.2.1~116
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42e041081f06e98d902855fd867ab0d7b5884d9c;p=ceph.git

Merge PR #27117 into nautilus

* refs/pull/27117/head:
	osd/OSDMap: add 'zone' to default crush map

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

42e041081f06e98d902855fd867ab0d7b5884d9c