Remove merge-failure pipeline configuration

This was previously deprecated and should be removed shortly before
we release Zuul v7.

Change-Id: Idbdfca227d2f7ede5583f031492868f634e1a990
This commit is contained in:
James E. Blair
2022-08-22 16:17:32 -07:00
parent 7949efd255
commit 024246cb72
3 changed files with 12 additions and 12 deletions

View File

@@ -0,0 +1,6 @@
upgrade:
- |
The previously deprecated ``merge-failure`` and
``merge-failure-message`` pipeline configuration options have been
removed. Use ``merge-conflict`` and ``merge-conflict-message``
respectively instead.