]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0bea75 b305796)
Merge PR #32812 into master
authorSage Weil <sage@redhat.com>
Mon, 27 Jan 2020 17:39:53 +0000 (11:39 -0600)
committerSage Weil <sage@redhat.com>
Mon, 27 Jan 2020 17:39:53 +0000 (11:39 -0600)
* refs/pull/32812/head:
mgr/cephadm: get --osd-uuid deploy arg from osdmap
mgr/cephadm: fetch keyring in _create_daemon()

Reviewed-by: Sebastian Wagner <swagner@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.