]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #25833 from vshankar/wip-37762
authorYuri Weinstein <yweinste@redhat.com>
Fri, 18 Jan 2019 15:47:26 +0000 (07:47 -0800)
committerGitHub <noreply@github.com>
Fri, 18 Jan 2019 15:47:26 +0000 (07:47 -0800)
luminous: config: drop config::lock when invoking config observer

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDSDaemon.cc
src/mon/Monitor.cc
src/osd/OSD.cc
src/osdc/Objecter.cc

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