From: Sage Weil <sage@redhat.com>
Date: Tue, 31 Jul 2018 21:24:22 +0000 (-0500)
Subject: Merge PR #23354 into master
X-Git-Tag: v14.0.1~725
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0aba0f4bcd063b0b130d189188a3dbfca9503e86;p=ceph.git

Merge PR #23354 into master

* refs/pull/23354/head:
	src/osd/PG.cc: remove redundant call to trim_log()

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

0aba0f4bcd063b0b130d189188a3dbfca9503e86