]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #29976 from dzafman/wip-38450
authorYuri Weinstein <yweinste@redhat.com>
Thu, 3 Oct 2019 23:35:17 +0000 (16:35 -0700)
committerGitHub <noreply@github.com>
Thu, 3 Oct 2019 23:35:17 +0000 (16:35 -0700)
mimic: osd: make project_pg_history handle concurrent osdmap publish

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

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