]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ce13562 aad318a)
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)
commit7e8c6838af4fdc816f5bb4edfd57a1ad26d9d8e8
treefa283ec5ca597edea3bc34f0c17b51970f4db1bdtree | snapshot
parentce13562a74fac5b317d5213c2a7a6b910f2da694commit | diff
parentaad318abc9a680d68aab96b051fb7457c8f7feaccommit | diff
Merge PR #23126 into master

* 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>
src/common/config_proxy.h diff1 | diff2 | blob | history
src/crimson/common/config_proxy.h diff1 | diff2 | blob | history
src/mon/Monitor.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osdc/Objecter.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.