]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #43734 into master
authorSage Weil <sage@newdream.net>
Sat, 30 Oct 2021 19:51:31 +0000 (15:51 -0400)
committerSage Weil <sage@newdream.net>
Sat, 30 Oct 2021 19:51:31 +0000 (15:51 -0400)
commitbd093a848db30548afade1fc762b150bac8954cf
tree8f914c871009e21ce9b0a2338f0cd8c1e4d92f34
parent3e22bfe8e25b43be2b1bbed5109e7c32e8a67ec6
parentf68f9dd7c389cbd7846c366cd528769f382c0217
Merge PR #43734 into master

* refs/pull/43734/head:
cephadm: --config-json overrides --config or --keyring args

Reviewed-by: Adam King <adking@redhat.com>