]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d316156 718471b)
Merge PR #33766 into master
authorSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 00:58:00 +0000 (18:58 -0600)
committerSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 00:58:00 +0000 (18:58 -0600)
* refs/pull/33766/head:
mgr/cephadm: fix placement when existing + specified don't overlap

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.