summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-12-19 23:11:50 +0000
committerGerrit Code Review <review@openstack.org>2022-12-19 23:11:50 +0000
commit934846b9b3c2bfa65935f4374a87cd0e63a6c881 (patch)
tree29d6ff7565e8a39631aaf65064e5adaceb7217ad /doc
parent01eb95be5245629c681ae932ebd2ffbea998e161 (diff)
parent640059a67a68c8d2d9843765d586d7845e7648a9 (diff)
downloadzuul-934846b9b3c2bfa65935f4374a87cd0e63a6c881.tar.gz
Merge "Report a config error for unsupported merge mode"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/developer/model-changelog.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/source/developer/model-changelog.rst b/doc/source/developer/model-changelog.rst
index c6d8fedbd..a14ff9895 100644
--- a/doc/source/developer/model-changelog.rst
+++ b/doc/source/developer/model-changelog.rst
@@ -100,3 +100,9 @@ Version 10
:Prior Zuul version: 6.4.0
:Description: Renames admin_rules to authz_rules in unparsed abide.
Affects schedulers and web.
+
+Version 11
+----------
+
+:Prior Zuul version: 8.0.1
+:Description: Adds merge_modes to branch cache. Affects schedulers and web.