]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9c832fd 03a761c)
Merge PR #25052 into master
authorSage Weil <sage@redhat.com>
Fri, 16 Nov 2018 13:11:15 +0000 (07:11 -0600)
committerSage Weil <sage@redhat.com>
Fri, 16 Nov 2018 13:11:15 +0000 (07:11 -0600)
commit9989dddca3d30eac4721e8ae5e357dc055fe4461
treec1fc3806a27615a4afc420f18d66f4fb2e3d1a5atree | snapshot
parent9c832fdb37f1f4866eefac0fa915e648a6de4ccfcommit | diff
parent03a761c980a1171fe6adf7a463f3ab80ec6d4052commit | diff
Merge PR #25052 into master

* refs/pull/25052/head:
mgr: lock pg_map too for osd_pool_stats and notify_osdmap
mgr/DaemonServer: use with_osdmap_and_pgmap instead of nested calls
mgr/ClusterState: add with_osdmap_and_pgmap

Reviewed-by: Kefu Chai <kchai@redhat.com>
src/mgr/DaemonServer.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.