From: Sage Weil <sage@redhat.com>
Date: Tue, 4 Feb 2020 13:07:01 +0000 (-0600)
Subject: Merge PR #32995 into master
X-Git-Tag: v15.1.1~561
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b9a38a0371c3db0c45a192d52ae0916d83d7ca59;p=ceph-ci.git

Merge PR #32995 into master

* refs/pull/32995/head:
	cephadm: add group 'disk' to privileged container
	cephadm: adopt: disable ceph-volume unit on host
	cephadm: refactor privileged arg handling
	cephadm: chown block symlink targets
	cephadm-adoption-corpus: add stud-mon.tgz
	cephadm: adopt: rename leveldb *.ldb -> *.sst
	cephadm: adopt: by default, pull first
	cephadm: adopt: chown data content

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

b9a38a0371c3db0c45a192d52ae0916d83d7ca59