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

[JANSA] Renamed provider_foreman to configuration_manager #20183

Closed
wants to merge 1 commit into from

Conversation

h-kataria
Copy link
Contributor

@h-kataria h-kataria commented May 18, 2020

Renamed provider_foreman specific features, links etc to configuration_manager
Jansa specific PR for backport of #19949

Renamed provider_foreman specific features, links etc to configuration_manager
Jansa specific PR for backport of ManageIQ#19949
@miq-bot miq-bot changed the title [Jasna] Renamed provider_foreman to configuration_manager [JANSA] [Jasna] Renamed provider_foreman to configuration_manager May 18, 2020
@chessbyte chessbyte changed the title [JANSA] [Jasna] Renamed provider_foreman to configuration_manager [JANSA] Renamed provider_foreman to configuration_manager May 18, 2020
@miq-bot
Copy link
Member

miq-bot commented May 18, 2020

Checked commit h-kataria@b8c60f8 with ruby 2.5.7, rubocop 0.69.0, haml-lint 0.28.0, and yamllint
2 files checked, 0 offenses detected
Everything looks fine. 🍪

@Fryguy
Copy link
Member

Fryguy commented May 18, 2020

What were the conflicts that prevented a cherry-pick? I thought all other feature changes were going to be backported, so I wouldn't have expected this.

@h-kataria
Copy link
Contributor Author

when I tried to backport locally it conflicted with changes in #17500 and #19916 no idea why.

@simaishi
Copy link
Contributor

I think #19924 is causing the conflict.

@Fryguy
Copy link
Member

Fryguy commented May 18, 2020

I'm pretty sure ConfigurationProfiles are required for @h-kataria 's changes to work, so I think that one should be jansa/yes? as well. @bdunne ?

@bdunne
Copy link
Member

bdunne commented May 19, 2020

Yeah, I think those should go back. I marked them jansa/yes?

@Fryguy
Copy link
Member

Fryguy commented May 19, 2020

Ok, once those are back, @simaishi can you try a normal cherry-pick based backport of this one?

@miq-bot
Copy link
Member

miq-bot commented May 21, 2020

This pull request is not mergeable. Please rebase and repush.

@simaishi
Copy link
Contributor

#19949 was a clean cherry-pick after #19924 was backported. Closing.

@simaishi simaishi closed this May 21, 2020
@h-kataria h-kataria deleted the backport_pr_for_19949 branch December 31, 2020 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants