]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit64d27c2c88100c636f98f041374ba81aff43a897
tree3747e28508e9bdcc05766f65fcc599d89efed3f6tree | snapshot
parenta8062613c81ad08815edcdf06e668fcc77270a03commit | diff
parent3d776f1b50d34a408571c682a5eb0fc941c97cfecommit | diff
Merge PR #34156 into octopus

* 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>
Unnamed repository; edit this file 'description' to name the repository.