]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #18752 from liewegas/wip-peering-queue
authorSage Weil <sage@newdream.net>
Fri, 8 Dec 2017 01:43:16 +0000 (19:43 -0600)
committerGitHub <noreply@github.com>
Fri, 8 Dec 2017 01:43:16 +0000 (19:43 -0600)
osd: put peering events in main sharded wq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/ECBackend.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h
src/osd/PrimaryLogPG.cc
src/osd/ReplicatedBackend.cc

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