]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #28662 into master
authorSage Weil <sage@redhat.com>
Mon, 24 Jun 2019 18:13:48 +0000 (13:13 -0500)
committerSage Weil <sage@redhat.com>
Mon, 24 Jun 2019 18:13:48 +0000 (13:13 -0500)
* refs/pull/28662/head:
osd: share curmap in handle_osd_ping

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge