]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fd27be0) | patch
cephadm: merge `--config-and-keyring` and `--config-json` args
authorMichael Fritch <mfritch@suse.com>
Wed, 11 Mar 2020 01:27:36 +0000 (19:27 -0600)
committerMichael Fritch <mfritch@suse.com>
Wed, 11 Mar 2020 20:02:12 +0000 (14:02 -0600)
commita58468035b6a617e84471b2a98fa4d49a36c9444
tree1a973866fb2d9a3db9a4dc977a22f208e9ab8bf2tree | snapshot
parentfd27be036ff37abd6af844713661203970be928dcommit | diff
cephadm: merge `--config-and-keyring` and `--config-json` args

both are passed via stdin from the mgr in a JSON format

Signed-off-by: Michael Fritch <mfritch@suse.com>
src/cephadm/cephadm diff | blob | history
src/pybind/mgr/cephadm/module.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.