From: Yuri Weinstein <yweinste@redhat.com>
Date: Thu, 17 May 2018 15:42:02 +0000 (-0700)
Subject: Merge pull request #21764 from pdvian/wip-23914-luminous
X-Git-Tag: v12.2.6~114
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84e2cc29509ae2992467d487c79140ca1b95f2aa;p=ceph.git

Merge pull request #21764 from pdvian/wip-23914-luminous

osd/PrimaryLogPG: avoid infinite loop when flush collides with write …

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

84e2cc29509ae2992467d487c79140ca1b95f2aa