]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #23633 into master
authorSage Weil <sage@redhat.com>
Thu, 30 Aug 2018 13:52:32 +0000 (08:52 -0500)
committerSage Weil <sage@redhat.com>
Thu, 30 Aug 2018 13:52:32 +0000 (08:52 -0500)
* 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>
1  2 
src/osd/PrimaryLogPG.cc

Simple merge