summaryrefslogtreecommitdiff
path: root/releasenotes
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-09-16 03:27:51 +0000
committerGerrit Code Review <review@openstack.org>2022-09-16 03:27:51 +0000
commitcda23ce556bdc9b56bcc662bc2370ded258e9def (patch)
tree2900c8b2b90bf3f6f0a4d5c9993336f9d22059f2 /releasenotes
parent861f9934af8ca8408d265cfeb4f8110e9eb92ceb (diff)
parent024246cb72b05caca3a797612490f83c1434d339 (diff)
downloadzuul-cda23ce556bdc9b56bcc662bc2370ded258e9def.tar.gz
Merge "Remove merge-failure pipeline configuration"
Diffstat (limited to 'releasenotes')
-rw-r--r--releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml6
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.