]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit1b70eed08879696a229865e445ddf351137c3302
tree15c3bb08b54e1352a390ca42d8505acde6d76f50tree | snapshot
parent22f785e1862f55c56bf8c1688aacceefefd23d33commit | diff
parentadc8a9c0a812c3dc8de118a698cc5b9ca3bc8500commit | diff
Merge PR #41049 into master

* 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>
Unnamed repository; edit this file 'description' to name the repository.