]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit804458bf51d672c58fe3cb0cb33d91c185ac73e9
tree376f5f3f8d9ec31816a999bf2933af40d4ac9a96
parent644d49ec9846ace298acdbf947a58e7beb02af09
parent6c1071295917818d6dcbb76fb3ca1bed9aa96226
Merge PR #30640 into master

* 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>
src/osd/OSD.h
src/osd/PrimaryLogPG.cc