]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit22d78ad40248a4e7689d5789710ae5b793a7a966
treec4567a84b5e206014dd73305ee74b92c227c767btree | snapshot
parent2ebec917d3b7c9b8b673bd4d819a3dbf3dd1c966commit | diff
parent1c2bc53df73d9891330cf0b18f5193167d64df61commit | diff
Merge PR #24668 into master

* 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>
src/mgr/DaemonServer.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.