]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #27914 from dzafman/wip-39304
authorDavid Zafman <dzafman@redhat.com>
Sat, 11 May 2019 00:41:31 +0000 (17:41 -0700)
committerGitHub <noreply@github.com>
Sat, 11 May 2019 00:41:31 +0000 (17:41 -0700)
commit624d1172c34bccd49dbd05daa2b7877abb705bc7
tree2e05872a182264f2c579712fe36a97d3af2d663c
parent09fb7a5a1252028ac87cf1a0719bbc5c502c4480
parentf526c6d55c8866712c10b64491fe9371f64cf4d5
Merge pull request #27914 from dzafman/wip-39304

osd: Include dups in copy_after() and copy_up_to()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
src/osd/PeeringState.cc
src/osd/osd_types.cc
src/osd/osd_types.h