]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a806261 3d776f1)
Merge PR #34156 into octopus
authorSage Weil <sage@redhat.com>
Thu, 26 Mar 2020 01:19:46 +0000 (20:19 -0500)
committerSage Weil <sage@redhat.com>
Thu, 26 Mar 2020 01:19:46 +0000 (20:19 -0500)
* refs/pull/34156/head:
cephadm: init config and keyring with None
cephadm: allow config and keyring args for ceph-volume
qa/workunits/cephadm: create lvs before calling cephadm
qa/workunits/cephadm/test_cephadm.sh: move osd test to ceph-volume
qa/workunits/cephadm/test_cephadm.sh: fix mon.b failure

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.