From: Samuel Just <sam.just@inktank.com>
Date: Mon, 21 Apr 2014 22:13:22 +0000 (-0700)
Subject: Merge pull request #1703 from ceph/wip-7942
X-Git-Tag: v0.80-rc1~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f44e2c82e1c48d94c9e084eee874bcfbb29cfe4c;p=ceph.git

Merge pull request #1703 from ceph/wip-7942

Wip 7942

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

f44e2c82e1c48d94c9e084eee874bcfbb29cfe4c