]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32972 into master
authorSage Weil <sage@redhat.com>
Thu, 30 Jan 2020 13:01:47 +0000 (07:01 -0600)
committerSage Weil <sage@redhat.com>
Thu, 30 Jan 2020 13:01:47 +0000 (07:01 -0600)
* refs/pull/32972/head:
python-common/ceph/deployment/translate: use 'prepare' instead of 'batch' for trivial case
qa/tasks/cephadm: pass short dev name to osd prepare
mgr/cephadm: fix detection of just-created OSDs
mgr/cephadm: properly indent raise conditions
mgr/cephadm: add warning to other orchestrators
mgr/cephadm: separate acceptance criterias for Devices
mgr/cephadm: fix typos
mgr/cephadm: move utils in test/utils.py
mgr/ssh: increase disk size to 20G
drivegroups: add support for drivegroups + tests
mgr/orch_cli: allow multiple drivegroups
drivegroups: translate disk spec to ceph-volume call

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Joshua Schmid <jschmid@suse.de>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge