From: Sage Weil <sage@inktank.com>
Date: Wed, 25 Jun 2014 18:35:16 +0000 (-0700)
Subject: Merge pull request #1978 from adamcrume/master
X-Git-Tag: v0.83~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=381aac542055d1e924f49252b3f7e88f330d28f9;p=ceph.git

Merge pull request #1978 from adamcrume/master

OSD bug fix and developer error message

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

381aac542055d1e924f49252b3f7e88f330d28f9