From: Sage Weil <sage@redhat.com>
Date: Wed, 24 Feb 2016 18:03:55 +0000 (-0800)
Subject: Merge pull request #7590 from SUSE/wip-14720-hammer
X-Git-Tag: v0.94.7~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf6dcc7c6da5d06b21e4a4fad3f7a65e8ca84f50;p=ceph.git

Merge pull request #7590 from SUSE/wip-14720-hammer

hammer: OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from
---

bf6dcc7c6da5d06b21e4a4fad3f7a65e8ca84f50