From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Aug 2014 00:48:41 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-filejournal'
X-Git-Tag: v0.86~230
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f1e1e0e347b0f4073162e605fc3c10c8015fe82;p=ceph.git

Merge remote-tracking branch 'gh/wip-filejournal'

Reviewed-by: Sage Weil <sage@redhat.com>
Tested-by: Mark Kirkwood <mark.kirkwood@catalyst.net.nz>
---

5f1e1e0e347b0f4073162e605fc3c10c8015fe82