]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #27575 into master
authorSage Weil <sage@redhat.com>
Wed, 24 Jul 2019 13:54:59 +0000 (08:54 -0500)
committerSage Weil <sage@redhat.com>
Wed, 24 Jul 2019 13:54:59 +0000 (08:54 -0500)
commitfe45db9007a6fbb8084b50b88c5520b742f20d21
treeadc4f8da54ebcfa12409593d8514e7359c950b88
parent610e9f750e958c519fce2b1914986c62711cc2a1
parent1cc239820891c7ecd9592529b8ee77f97571765c
Merge PR #27575 into master

* refs/pull/27575/head:
osd: avoid prep_object_replica_pushes() on clone object when head missing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/osd/PrimaryLogPG.cc
src/osd/ReplicatedBackend.cc