From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Jul 2017 05:15:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/15844/head' into master
X-Git-Tag: v12.1.1~144
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f121c70d346fad30da820810cc685ce06dded0d;p=ceph.git

Merge remote-tracking branch 'upstream/pull/15844/head' into master

* commit '47ab651a1f':
  qa: reset journal before cephfs_journal_tool_smoke.sh exits
  qa: remove 'apply' from journal_tool_smoke.sh

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

8f121c70d346fad30da820810cc685ce06dded0d