]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f59a673 4b5c6b8)
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)
commit92c198f92c209cbe6c9d877fb76b1dad7e326c92
tree6d066e217a4b4888cf742b594a57658867ce951atree | snapshot
parentf59a673cae36cc5c9d494d43f2b7a019b91b6ddacommit | diff
parent4b5c6b88d444e2173e716fe4890717873c8dc8e5commit | diff
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>
src/osd/PrimaryLogPG.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.