]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 130e662 fd2e1f3)
Merge PR #24806 into master
authorSage Weil <sage@redhat.com>
Fri, 9 Nov 2018 20:53:56 +0000 (14:53 -0600)
committerSage Weil <sage@redhat.com>
Fri, 9 Nov 2018 20:53:56 +0000 (14:53 -0600)
* refs/pull/24806/head:
os/filestore: fix merge_collection replay guards

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.