From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 7 Apr 2016 21:11:10 +0000 (-0700)
Subject: Merge pull request #8490 from dillaman/wip-15097
X-Git-Tag: v10.1.2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f00ea3f8982f8dd2b718fedb1257a94f1e5543d5;p=ceph.git

Merge pull request #8490 from dillaman/wip-15097

rbd: journal reset should disable/re-enable journaling feature

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

f00ea3f8982f8dd2b718fedb1257a94f1e5543d5