]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #13072 from wido/issue-18638
authorSage Weil <sage@redhat.com>
Wed, 25 Jan 2017 12:22:41 +0000 (06:22 -0600)
committerGitHub <noreply@github.com>
Wed, 25 Jan 2017 12:22:41 +0000 (06:22 -0600)
osd: Return correct osd_objectstore in OSD metadata

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
1  2 
src/osd/OSD.cc

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