From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 7 Jan 2020 21:56:11 +0000 (-0800)
Subject: Merge PR #32452 into master
X-Git-Tag: v15.1.0~301
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a30eb9a4e1016ed2f92c60c16254051c5cbf89ca;p=ceph-ci.git

Merge PR #32452 into master

* refs/pull/32452/head:
	cephfs-journal-tool: fix the usage
	cephfs-journal-tool: fix crash with empty argv

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

a30eb9a4e1016ed2f92c60c16254051c5cbf89ca