]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ebec91 1c2bc53)
Merge PR #24668 into master
authorSage Weil <sage@redhat.com>
Tue, 30 Oct 2018 13:47:54 +0000 (08:47 -0500)
committerSage Weil <sage@redhat.com>
Tue, 30 Oct 2018 13:47:54 +0000 (08:47 -0500)
* refs/pull/24668/head:
mgr/DaemonState: fix get_config_defaults locking
mgr: adjust DaemonState device index when daemon metadata is updated
mgr/DaemonState: clear devices in set_metadata

Reviewed-by: Tim Serong <tserong@suse.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.