From: Sage Weil <sage@redhat.com>
Date: Tue, 9 Feb 2016 13:56:14 +0000 (-0500)
Subject: Merge pull request #7553 from XinzeChi/wip-osdmap-affinity
X-Git-Tag: v10.1.0~421
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8895416a0be0e65661bd79b85ee29a30e2db5bab;p=ceph.git

Merge pull request #7553 from XinzeChi/wip-osdmap-affinity

osd: OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from

Reviewed-by: Sage Weil <sage@redhat.com>
---

8895416a0be0e65661bd79b85ee29a30e2db5bab