]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e22bfe f68f9dd)
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)
* refs/pull/43734/head:
cephadm: --config-json overrides --config or --keyring args

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.