diff options
| author | James E. Blair <jim@acmegating.com> | 2022-08-22 16:17:32 -0700 |
|---|---|---|
| committer | James E. Blair <jim@acmegating.com> | 2022-09-02 10:13:41 -0700 |
| commit | 024246cb72b05caca3a797612490f83c1434d339 (patch) | |
| tree | c0fe8e0a341b774011004289957e4601f8d46eb2 /releasenotes | |
| parent | 7949efd255e76dd63412a13edac3927bf2939b84 (diff) | |
| download | zuul-024246cb72b05caca3a797612490f83c1434d339.tar.gz | |
Remove merge-failure pipeline configuration
This was previously deprecated and should be removed shortly before
we release Zuul v7.
Change-Id: Idbdfca227d2f7ede5583f031492868f634e1a990
Diffstat (limited to 'releasenotes')
| -rw-r--r-- | releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml b/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml new file mode 100644 index 000000000..962c1702e --- /dev/null +++ b/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml @@ -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. |