]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge remote-tracking branch 'upstream/pull/15844/head' into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 05:15:33 +0000 (22:15 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Jul 2017 05:16:02 +0000 (22:16 -0700)
* 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>

Trivial merge