From: Sage Weil <sage@redhat.com>
Date: Wed, 15 Jan 2020 14:39:48 +0000 (-0600)
Subject: Merge PR #32411 into master
X-Git-Tag: v15.1.0~213
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b7f5de2353cc9e6d81c778d8e4c688de66cd6fd;p=ceph.git

Merge PR #32411 into master

* refs/pull/32411/head:
	qa/tasks/ceph_manager: enable ceph-objectstore-tool via cephadm
	qa/tasks/cephadm: support crush_tunables config option

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

4b7f5de2353cc9e6d81c778d8e4c688de66cd6fd