Fix imports that were missed #1679
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
ANeumann82
requested review from
alenkacz,
gerred,
kensipe,
nfnt and
zen-dog
as code owners
zen-dog
approved these changes
Sep 7, 2020
|
Merged without 24h wait because it fixes a broken main. |
|
@ANeumann82 how did PR testing not catch this? do we need to fix something? |
|
@kensipe Well, the issue here is that GitHub allows a PR to be merged even if it doesn't contain the latest changes from main - unless there are conflicts. (This is good in my mind, otherwise it would become pretty cumbersome to merge multiple PRs). In this case "main" contained some new code that was not covered by this PR, that's why this PRs testing didn't catch it. It would have been correct to merge main into the other PR before merging it into main. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Signed-off-by: Andreas Neumann aneumann@mesosphere.com