From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 9 Nov 2020 16:17:18 +0000 (-0800)
Subject: Merge PR #37932 into master
X-Git-Tag: v16.1.0~647
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8aae1dfdf19393e6f9f86f1a83fbd538dc6ebfb4;p=ceph.git

Merge PR #37932 into master

* refs/pull/37932/head:
	src/script/ceph-backport.sh: abort if jq not available

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

8aae1dfdf19393e6f9f86f1a83fbd538dc6ebfb4