]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21764 from pdvian/wip-23914-luminous
authorYuri Weinstein <yweinste@redhat.com>
Thu, 17 May 2018 15:42:02 +0000 (08:42 -0700)
committerGitHub <noreply@github.com>
Thu, 17 May 2018 15:42:02 +0000 (08:42 -0700)
osd/PrimaryLogPG: avoid infinite loop when flush collides with write …

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/PrimaryLogPG.cc

Simple merge