Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 24, 2025

@ajaynes-godaddy
Copy link
Contributor

ajaynes-godaddy commented May 24, 2025

@agibson-godaddy I merged #772 not realizing it was previously based on the release/5.15.11 branch and had since updated to master. So those changes from #772 have already been merged to master. 🤦

I went ahead and added a changelog entry for this release covering the already-merged changes, as well as changelog entries and dates going back to 5.15.8. See 5386cb4 and 386925d.

@agibson-godaddy
Copy link
Contributor

@agibson-godaddy I merged #772 not realizing it was previously based on the release/5.15.11 branch and had since updated to master. So those changes from #772 have already been merged to master. 🤦

I went ahead and added a changelog entry for this release covering the already-merged changes, as well as changelog entries and dates going back to 5.15.8. See 5386cb4 and 386925d.

Sorry @ajaynes-godaddy I forgot I had started the PR against a different version. Thanks for handling the changelog as well -- I'd forgotten that existed!

@agibson-godaddy agibson-godaddy marked this pull request as ready for review May 27, 2025 15:30
@agibson-godaddy agibson-godaddy merged commit 1987b74 into master May 27, 2025
5 checks passed
@agibson-godaddy agibson-godaddy deleted the release/5.15.12 branch May 27, 2025 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants