From: Sage Weil <sage@redhat.com>
Date: Sat, 18 Jan 2020 01:13:11 +0000 (-0600)
Subject: Merge PR #32701 into master
X-Git-Tag: v15.1.0~189
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7dd3b4f41d0f9381bc7f6ec5c6524a667b1d7ba6;p=ceph.git

Merge PR #32701 into master

* refs/pull/32701/head:
	qa/tasks/ceph_manager: fix ceph-objectstore-tool calls
	qa/tasks/ceph_manager: fix admin_socket remote when using cephadm
	qa/tasks/ceph_manager: --no-mon-config to ceph-objectstore-tool
	qa/tasks/ceph_manager: fix filestore split command
	qa/tasks/ceph_manager: fix import line

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

7dd3b4f41d0f9381bc7f6ec5c6524a667b1d7ba6