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

Fixes #35543 - Explicitly vendor sinatra in Foreman #8513

Merged

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Sep 20, 2022

This cherry picks the changes from develop to avoid 2 packages shipping the same file. I don't know if I can submit this in one PR, given one depends on the other.

@theforeman-bot theforeman-bot added DEB Stable branch PRs that are opened against a stable branch. Usually a cherry pick and removed Not yet reviewed labels Sep 20, 2022
@ehelms
Copy link
Member

ehelms commented Sep 20, 2022

Looks like it is not passing -- so you may need to split, either way it's an ACK from me however you want to handle it

@ekohl
Copy link
Member Author

ekohl commented Sep 20, 2022

[test deb]

@ekohl
Copy link
Member Author

ekohl commented Sep 20, 2022

I opened #8514 to do just the Foreman changes.

@ekohl ekohl force-pushed the deb/3.4-35543-explicitly-vendor-sinatra branch from 915883e to c58ebc6 Compare September 21, 2022 12:12
@ekohl ekohl merged commit c58ebc6 into theforeman:deb/3.4 Sep 21, 2022
@ekohl ekohl deleted the deb/3.4-35543-explicitly-vendor-sinatra branch September 21, 2022 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DEB Stable branch PRs that are opened against a stable branch. Usually a cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants