From: Samuel Just <sam.just@inktank.com>
Date: Thu, 7 Aug 2014 22:56:18 +0000 (-0700)
Subject: Merge pull request #2226 from athanatos/wip-8396
X-Git-Tag: v0.85~72
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de0c7202a0cc883d8433fae0ef1f64daafa106bb;p=ceph.git

Merge pull request #2226 from athanatos/wip-8396

Wip 8396

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

de0c7202a0cc883d8433fae0ef1f64daafa106bb