craig[bot]

Build succeeded: * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223671) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223738) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223687) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223776) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223766) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223729) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223669) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223810) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223764) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/15741065454/job/44366223677)

Build succeeded: * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751935142) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751935616) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751933414) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751935977) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751932916) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751936288) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751933170) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751932424) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751934393) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751934940) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751933671) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751934682) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751935369) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/10728102714/job/29751933918)

Build succeeded: * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124440201) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124436137) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124437072) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124437951) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124438446) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124438207) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124436822) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124437351) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124439565) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124438720) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124438994) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124437604) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124436537) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/10854301204/job/30124439919)

Build succeeded: * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242251577) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242255714) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242253237) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242252363) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242254912) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242250708) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242254549) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242252746) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242255316) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242249924) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242253679) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242251996) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242256082) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/11238156976/job/31242251124)

Merge conflict.

Build succeeded: * [lint](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601945) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601957) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601925) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601955) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601940) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601947) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601942) * unit_tests * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601923) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/16230982973/job/45833601960)

Build succeeded: * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435313880) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435316042) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435315510) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435313137) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435313572) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435317432) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435315042) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435315752) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435316868) * lint * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435314357) * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435316318) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435316593) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/10618926236/job/29435315279)

Build succeeded: * [macos_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496711066) * [windows_build](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496711933) * [macos_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496711291) * [docker_image_amd64](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496708773) * [unit_tests](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496711571) * [check_generated_code](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496709193) * [lint](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496709592) * [linux_arm64_build](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496710303) * [linux_amd64_build](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496709931) * [linux_amd64_fips_build](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496710108) * [local_roachtest](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496710629) * [acceptance](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496709013) * [local_roachtest_fips](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496710824) * [examples_orms](https://github.com/cockroachdb/cockroach/actions/runs/10639194274/job/29496709760)