]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit919aa37f821c6afb0782765a8185f3fd791130ea
tree8e0beb529e834805c30d4619900766cd5f75bedc
parent130e6625ebbe3a2af3ccad9adc8c0e10f9ca6de0
parentfd2e1f3974512995e2cefa17eb1c2d5227ceac2b
Merge PR #24806 into master

* refs/pull/24806/head:
os/filestore: fix merge_collection replay guards

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