From: David Zafman Date: Thu, 25 Feb 2016 22:13:37 +0000 (-0800) Subject: Merge backport branch 'wip-journal-header' of git://github.com/XinzeChi/ceph into... X-Git-Tag: v0.94.7~28^2~12 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db68c6cb683870e68bf6143c6902b8ac89ecdc3a;p=ceph.git Merge backport branch 'wip-journal-header' of git://github.com/XinzeChi/ceph into wip-14077-hammer Includes a change to the code in the original merge commit itself --- db68c6cb683870e68bf6143c6902b8ac89ecdc3a