From: Sage Weil <sage@inktank.com>
Date: Tue, 8 Apr 2014 04:27:04 +0000 (-0700)
Subject: Merge pull request #1594 from ceph/wip-7958
X-Git-Tag: v0.80-rc1~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ea31f152d1023314823bbefbcce9eb991734697;p=ceph.git

Merge pull request #1594 from ceph/wip-7958

wip 7958

Passed sage-2014-04-07_07:04:02-fs-wip-7958-testing-basic-plana.

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

9ea31f152d1023314823bbefbcce9eb991734697