From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Sep 2018 17:16:05 +0000 (-0500)
Subject: Merge PR #24197 into master
X-Git-Tag: v14.0.1~223
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=57c34b1905c89c5f0d7c3ec2a3e66e4a27abc918;p=ceph.git

Merge PR #24197 into master

* refs/pull/24197/head:
	doc: remove Calamari content from ceph-deploy

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

57c34b1905c89c5f0d7c3ec2a3e66e4a27abc918