From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 21 May 2021 15:34:21 +0000 (-0700)
Subject: Merge pull request #41464 from jdurgin/wip-bib
X-Git-Tag: v17.1.0~1882
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af54ba2d8b706e471950bb5e2dd6541b94d5c32c;p=ceph.git

Merge pull request #41464 from jdurgin/wip-bib

script/build-integration-branch: always generate merge commits

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
---

af54ba2d8b706e471950bb5e2dd6541b94d5c32c