From: Samuel Just <sjust@redhat.com>
Date: Wed, 22 Jun 2016 18:16:47 +0000 (-0700)
Subject: Merge pull request #1002 from athanatos/wip-osd-recovery
X-Git-Tag: v11.1.1~58^2^2~162
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d27b5802ac4cf73cb9dada77ca79da467bc1f52;p=ceph.git

Merge pull request #1002 from athanatos/wip-osd-recovery

osd_recovery: add delay to ensure maps propogate

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

3d27b5802ac4cf73cb9dada77ca79da467bc1f52