]> 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: 4898dc8 8a65b2a)
Merge PR #25303 into master
authorSage Weil <sage@redhat.com>
Thu, 29 Nov 2018 20:25:19 +0000 (14:25 -0600)
committerSage Weil <sage@redhat.com>
Thu, 29 Nov 2018 20:25:19 +0000 (14:25 -0600)
* refs/pull/25303/head:
mgr/DaemonState: fix get_config_defaults locking

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mgr/DaemonServer.cc patch | diff1 | diff2 | blob | history

diff --cc src/mgr/DaemonServer.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.