]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32995 into master
authorSage Weil <sage@redhat.com>
Tue, 4 Feb 2020 13:07:01 +0000 (07:07 -0600)
committerSage Weil <sage@redhat.com>
Tue, 4 Feb 2020 13:07:01 +0000 (07:07 -0600)
* 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>
1  2 
src/cephadm/cephadm

Simple merge