This repository was archived by the owner on Mar 5, 2025. It is now read-only.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
release/1.6.0
branch was made from therelease/1.5.3
branch to avoid including any changes that had been merged since then and are scheduled to be release now as1.6.1
(#4391). This resulted in a bunch of merge conflicts and I'm not sure the best way to handle the situation, so I opted to create this PR that does everything #4391 is supposed to do (bump the version numbers and updatedist/
) manually, with the end result being as if we had released1.6.0
before merging any of the changes schedule for1.6.1