]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitb9a38a0371c3db0c45a192d52ae0916d83d7ca59
treeeef6c22640170d142c2f5f5ef0d764690a26bab7
parent3a3fd5679c601dabcc40636dfa9cc2e05f3e66f4
parentb5e5c753f415ab1f18ccfe3ad636649a0f51a93a
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>
src/cephadm/cephadm