This repository has been archived by the owner on Dec 16, 2022. 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.
This forks our 2019-04-02 build and "cherry picks" in the following changes:
I squashed commits 2 and 3 each into a single commit on this branch. Item 2 did not apply cleanly so I had to manually resolve merge conflicts.
Once this merge is approved we will reset our master branch to point here and tag the old master branch so that it's not lost should we need to recover that state:
When it's time to sync back up with upstream we'll revert the 4 comments above and then merge vitessio/vitess master.