From: athanatos <rexludorum@gmail.com>
Date: Mon, 28 Oct 2013 20:50:34 +0000 (-0700)
Subject: Merge pull request #760 from ceph/wip-6585
X-Git-Tag: v0.72-rc1~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7cbfdbf38d92f1ed2cf1f3803cd53d08beba4fad;p=ceph.git

Merge pull request #760 from ceph/wip-6585

Wip 6585

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

7cbfdbf38d92f1ed2cf1f3803cd53d08beba4fad