]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #7553 from XinzeChi/wip-osdmap-affinity
authorSage Weil <sage@redhat.com>
Tue, 9 Feb 2016 13:56:14 +0000 (08:56 -0500)
committerSage Weil <sage@redhat.com>
Tue, 9 Feb 2016 13:56:14 +0000 (08:56 -0500)
osd: OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSDMap.h

Simple merge