]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22f785e adc8a9c)
Merge PR #41049 into master
authorSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:25:30 +0000 (14:25 -0400)
committerSage Weil <sage@newdream.net>
Wed, 28 Apr 2021 18:25:30 +0000 (14:25 -0400)
* refs/pull/41049/head:
cephadm: re-assimilate user provided conf after mgr created

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

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