From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 29 Jun 2018 17:28:40 +0000 (-0700)
Subject: Merge PR #22111 into master
X-Git-Tag: v14.0.1~970
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92af779cc9118ce82553776243f1413deb82b2ba;p=ceph-ci.git

Merge PR #22111 into master

* refs/pull/22111/head:
	cephfs-journal-tool: check fsid when import purge queue

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

92af779cc9118ce82553776243f1413deb82b2ba