]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd32b0ad99db7c52cc02b59d5306afad015334051
treeac302c7c43cf4063a7f0b8f233d055bc6fc0d3aatree | snapshot
parentb0bea75ed710b41fb907fd7b4855afd3f4fea1a3commit | diff
parentb305796a1252374dccb7bd2d98b2224f8a8fed8fcommit | diff
Merge PR #32812 into master

* 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>
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.