From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Mar 2019 10:07:37 +0000 (-0500)
Subject: Merge PR #27070 into master
X-Git-Tag: v15.0.0~139
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2b08eac17d1ba26dc33a92c015a6f778e9552db;p=ceph.git

Merge PR #27070 into master

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

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

b2b08eac17d1ba26dc33a92c015a6f778e9552db