From: Samuel Just <sam.just@inktank.com>
Date: Fri, 16 Aug 2013 23:35:21 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/wip-zfs'
X-Git-Tag: v0.68~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=967dc2388c6aaa8a36464f9a35e5638f6685e445;p=ceph.git

Merge remote-tracking branch 'upstream/wip-zfs'

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

967dc2388c6aaa8a36464f9a35e5638f6685e445