Closed annrpom closed 13 hours ago
-- commits
line 12 at r1:
Do we need to add a
Fixes: #134934
Also?
Do we need to add a Fixes: #134934 Also?
Fixes: #134934
TFTRs! ('-')7
bors r+
Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches.
Issue #135807: branch-release-24.3.
:owl: Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool.
error creating merge commit from d0d3a1ef3a5c3a9bfce12ce2b215fedcf8a424de to blathers/backport-release-24.3-135933: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []
you may need to manually resolve merge conflicts with the backport tool.
Backport to branch 24.3.x failed. See errors above.
:owl: Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.
In #134522, we added a fix to ensure that we cleaned up backrefs properly for our
IndexZoneConfig
element, but in doing so, we created an overlap of field ID3
between v24.2+. This patch ensures that we do not re-use the same field ID for a different field in our IndexZoneConfig element by marking it asreserved
.Fixes: #133003 Fixes: #135807
Release note: None