From: Sage Weil <sage@inktank.com>
Date: Fri, 14 Mar 2014 18:28:50 +0000 (-0700)
Subject: Merge pull request #1459 from ceph/wip-7696
X-Git-Tag: v0.78~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb7551677323b5864f8770acfa4e2c43e5355b61;p=ceph.git

Merge pull request #1459 from ceph/wip-7696

Wip 7696

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

bb7551677323b5864f8770acfa4e2c43e5355b61