]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #23126 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 22 Dec 2018 20:27:57 +0000 (12:27 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 22 Dec 2018 20:27:57 +0000 (12:27 -0800)
* refs/pull/23126/head:
wherever: guard handle_conf_change() from concurrent execution
config: drop config_proxy::lock when invoking config observer

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/common/config_proxy.h
src/crimson/common/config_proxy.h
src/mon/Monitor.cc
src/osd/OSD.cc
src/osdc/Objecter.cc

Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge