Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jsonnet: fix windows addon #1094

Merged
merged 1 commit into from
Apr 16, 2021

Conversation

paulfantom
Copy link
Member

This is a follow-up to #1039 as merging it caused main branch to fail unit tests.

How did this happen?

Up for discussion:
Should we enable Require branches to be up to date before merging checkbox in branch protection rules for main branch? This should prevent issues as one we just experienced, but at the same time will require much more frequent rebases of PRs.
/cc @prometheus-operator/prometheus-operator-reviewers

Copy link
Member

@kakkoyun kakkoyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kakkoyun kakkoyun merged commit 0cde11d into prometheus-operator:main Apr 16, 2021
@paulfantom paulfantom deleted the follow-up#1039 branch April 16, 2021 15:21
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.

None yet

2 participants