From: Samuel Just <sjust@redhat.com>
Date: Fri, 11 Mar 2016 19:03:58 +0000 (-0800)
Subject: Merge pull request #7483 from liewegas/wip-osd-boot
X-Git-Tag: v10.1.0~139
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=193b3002773c056879232cf1becff7b880bd86c1;p=ceph.git

Merge pull request #7483 from liewegas/wip-osd-boot

osd: resolve boot vs NOUP set + clear race

Reviewed-by: Samuel Just <sjust@redhat.com>
---

193b3002773c056879232cf1becff7b880bd86c1