From: Josh Durgin Date: Tue, 28 Jan 2014 21:13:59 +0000 (-0800) Subject: Merge pull request #1154 from ceph/wip-7169-2 X-Git-Tag: v0.78~262 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccfe243db5749e3d9406dc1f4d2f768d00f8715e;p=ceph.git Merge pull request #1154 from ceph/wip-7169-2 Reviewed-by: Josh Durgin --- ccfe243db5749e3d9406dc1f4d2f768d00f8715e