From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 8 Apr 2019 16:35:43 +0000 (-0700)
Subject: Merge PR #27281 into master
X-Git-Tag: v15.1.0~2998
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7b03130e2a2db4a67f19759f78d20d3dd682f4eb;p=ceph-ci.git

Merge PR #27281 into master

* refs/pull/27281/head:
	script/ceph-release-notes: alternate merge commit format

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
---

7b03130e2a2db4a67f19759f78d20d3dd682f4eb