From: Samuel Just <sam.just@inktank.com>
Date: Wed, 7 Aug 2013 01:05:06 +0000 (-0700)
Subject: Merge branch 'wip-recovery-op-warn' into next
X-Git-Tag: v0.67~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fb06bf60c19709e0248c8bb485f26ea0175a1927;p=ceph.git

Merge branch 'wip-recovery-op-warn' into next

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

fb06bf60c19709e0248c8bb485f26ea0175a1927