From: Sage Weil <sage@redhat.com>
Date: Sat, 29 Feb 2020 03:32:47 +0000 (-0600)
Subject: Merge PR #33438 into master
X-Git-Tag: v15.1.1~196
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45555c529d96aaed2dad716695a7ccaa9eb51ff0;p=ceph.git

Merge PR #33438 into master

* refs/pull/33438/head:
	cephadm: add prometheus adopt

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

45555c529d96aaed2dad716695a7ccaa9eb51ff0