From: Greg Farnum <greg@inktank.com>
Date: Tue, 9 Apr 2013 23:00:41 +0000 (-0700)
Subject: Merge branch 'wip-journaler-4618' into next
X-Git-Tag: v0.61~212
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8eb5465c10840d047a894d1a4f079ff8b8d608b5;p=ceph.git

Merge branch 'wip-journaler-4618' into next

Reviewed-by: Sam Lang <sam.lang@inktank.com>
---

8eb5465c10840d047a894d1a4f079ff8b8d608b5