From: Sage Weil <sage@inktank.com>
Date: Tue, 3 Sep 2013 23:00:28 +0000 (-0700)
Subject: Merge branch 'wip-copyfrom'
X-Git-Tag: v0.69~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b2f296ed84169cd872d2ced3714f9a180994903;p=ceph.git

Merge branch 'wip-copyfrom'

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

2b2f296ed84169cd872d2ced3714f9a180994903