From: David Zafman <david.zafman@inktank.com>
Date: Fri, 4 Oct 2013 21:59:11 +0000 (-0700)
Subject: Merge pull request #667 from ceph/wip-6143
X-Git-Tag: v0.71~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5258c9c4e5bd61e6b1a1fdbdb781b9dee702fda3;p=ceph.git

Merge pull request #667 from ceph/wip-6143

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

5258c9c4e5bd61e6b1a1fdbdb781b9dee702fda3