From: Samuel Just <sam.just@inktank.com>
Date: Mon, 14 Apr 2014 23:10:42 +0000 (-0700)
Subject: Merge pull request #1654 from ceph/wip-7940
X-Git-Tag: v0.80-rc1~42
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=898ee4894eb35282575fcb117672de8fe32f83e7;p=ceph.git

Merge pull request #1654 from ceph/wip-7940

Wip 7940

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

898ee4894eb35282575fcb117672de8fe32f83e7