]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 644d49e 6c10712)
Merge PR #30640 into master
authorSage Weil <sage@redhat.com>
Wed, 2 Oct 2019 14:50:53 +0000 (09:50 -0500)
committerSage Weil <sage@redhat.com>
Wed, 2 Oct 2019 14:50:53 +0000 (09:50 -0500)
* refs/pull/30640/head:
osd/PrimaryLogPG: remove unused reply creation path
osd/PrimaryLogPG: include op_returns in dup replies
osd/PrimaryLog: drop unused reply_ctx() variant
osd/PrimaryLogPG: remove dead already_ack()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/OSD.h patch | diff1 | diff2 | blob | history
src/osd/PrimaryLogPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.