craig[bot]

Build succeeded: * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614068606) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614065766) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614068002) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614068397) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614066700) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614067517) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614066384) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614069067) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614067754) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614068213) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614066968) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614067190) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614066137) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/9305948527/job/25614068872)

Build succeeded: * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619946) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113620005) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619717) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113620062) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619767) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619689) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113620200) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113620133) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619592) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619851) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619902) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619811) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113620276) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9819752968/job/27113619643)

Build succeeded: * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666138929) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666136734) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666139297) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666136998) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666138375) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666138557) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666137855) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666139118) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666139451) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666137189) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666138229) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666138744) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666138037) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/9323293403/job/25666137654)

Merge conflict.

Build succeeded: * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655200591) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655201183) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655200056) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655203096) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655201552) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655199573) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655202184) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655201853) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655199835) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655202791) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655199187) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655202509) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9319817892/job/25655200889) * lint

Build succeeded: * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512129254) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512131387) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512130063) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512130571) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512130806) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512128607) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512131672) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512130304) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512129789) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512131091) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512128987) * unit_tests * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512129500) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9273010653/job/25512132259)

Build succeeded: * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787113) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787397) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426786596) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426786940) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787792) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787031) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787699) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426786739) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787304) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787497) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787228) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787896) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426786837) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9243091971/job/25426787600)

Build succeeded: * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803841874) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803841615) * lint * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803839432) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803842394) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803839748) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803843270) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803842142) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803841027) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803840458) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803842984) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803842681) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803840040) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9372419747/job/25803841296)

Build succeeded: * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657243633) * unit_tests * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657244209) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657246361) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657245911) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657244937) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657244703) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657244438) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657246588) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657243992) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657246122) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657245457) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657245723) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9320442881/job/25657245174)

Build succeeded: * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755614762) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755616750) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755616345) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755614932) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755616925) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755615273) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755615937) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755615752) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755615453) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755616572) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755614489) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755617084) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755615088) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/9356969293/job/25755616154)