From: Sage Weil <sage@redhat.com>
Date: Thu, 30 Aug 2018 13:52:32 +0000 (-0500)
Subject: Merge PR #23633 into master
X-Git-Tag: v14.0.1~452
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92c198f92c209cbe6c9d877fb76b1dad7e326c92;p=ceph.git

Merge PR #23633 into master

* refs/pull/23633/head:
	osd/PrimaryLogPG.cc: limit trimming at can_rollback_to

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

92c198f92c209cbe6c9d877fb76b1dad7e326c92