]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8e0382 8a167a6)
Merge PR #33870 into octopus
authorSage Weil <sage@redhat.com>
Thu, 12 Mar 2020 11:37:19 +0000 (06:37 -0500)
committerSage Weil <sage@redhat.com>
Thu, 12 Mar 2020 11:37:19 +0000 (06:37 -0500)
commit83c6921920688dd2d3bec984136a69e1f86bd2c5
treec90b337bb0504aaf31f715738a90d11244f3c181tree | snapshot
parente8e0382f39ed5c144c517a887125b8bf0e3139e3commit | diff
parent8a167a6fbdaa1201bfa4524473c50cffa5b0191ecommit | diff
Merge PR #33870 into octopus

* refs/pull/33870/head:
mgr/cephadm: fix redeploy for the crash daemon
cephadm: prefer config/keyring args
cephadm: raise Error when no config/keyring
cephadm: consolidate logic for reading `config-json`
cephadm: merge `--config-and-keyring` and `--config-json` args

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
src/cephadm/cephadm diff1 | diff2 | blob | history
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.