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.

Sign up for GitHub

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

Jump to bottom

create_disk: add spacing in bootargs #2230

Merged
merged 1 commit into from
Jun 17, 2021
Merged

create_disk: add spacing in bootargs #2230

merged 1 commit into from
Jun 17, 2021

Conversation

dustymabe
Copy link
Member

This is a follow up to dd3225f. The addition of a non empty string
value for bootargs before this point means we need to add to the
existing value.

@dustymabe
create_disk: add spacing in bootargs
db277f5 
This is a follow up to dd3225f. The addition of a non empty string
value for bootargs before this point means we need to add to the
existing value.
@dustymabe dustymabe mentioned this pull request Jun 17, 2021
Merged
@cgwalters
Copy link
Member

Random unrelated q: Anyone know why we don't have the GH "auto merge" functionality enabled on this repo?

@jlebon jlebon merged commit 0a5bb51 into coreos:main Jun 17, 2021
@dustymabe
Copy link
Member Author

Random unrelated q: Anyone know why we don't have the GH "auto merge" functionality enabled on this repo?

Someone may have disabled it because we've noticed several cases where it merged code without waiting for CI to complete.

@bgilbert
Copy link
Contributor

That might be related to jobs not being marked required. Looks like the CoreOS CI job currently isn't.

@jlebon
Copy link
Member

jlebon commented Jun 22, 2021 •
edited
Loading

I had come to the same conclusion last week and had added continuous-integration/jenkins/pr-merge as required. But looking now indeed it seems like it was removed. Assuming one of us didn't do that, I wonder if it's something in the Prow settings unsetting it. Edit: I've re-added it as required now. Let's see if it goes away again or if I had somehow messed up the first time.

@bgilbert
Copy link
Contributor

For the record, Prow was changing the branch protection settings on us. openshift/release#19571 should disable that behavior.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlebon jlebon jlebon approved these changes

@cgwalters cgwalters cgwalters approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dustymabe @cgwalters @bgilbert @jlebon