From: athanatos <rexludorum@gmail.com>
Date: Wed, 28 Aug 2013 21:10:37 +0000 (-0700)
Subject: Merge pull request #550 from ceph/wip-6040
X-Git-Tag: v0.69~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e63c1a4af6c956458cf2044ac45d2bb5833dbd2;p=ceph.git

Merge pull request #550 from ceph/wip-6040

Wip 6040

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.com>
---

3e63c1a4af6c956458cf2044ac45d2bb5833dbd2