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

refs #37433 - Revert indentation for subscription_manager_setup #10289

Merged
merged 1 commit into from
Aug 28, 2024

Conversation

stejskalleos
Copy link
Contributor

@stejskalleos stejskalleos commented Aug 27, 2024

This reverts commit aa8f66f.

The reverted change is breaking:

@stejskalleos stejskalleos marked this pull request as ready for review August 27, 2024 10:34
@stejskalleos
Copy link
Contributor Author

@ShimShtein @ekohl Since the original change is breaking multiple critical features, I think we should revert it and find a different fix.

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Agreed, and we should cherry pick this to 3.12. While doing so, we shouldn't forget to update the Redmine issue to reflect it was reverted.

@stejskalleos stejskalleos changed the title Revert "Fixes #37433 - Set indentation when calling subscription_manager_setup" Fixes #37766 - Revert indentation for subscription_manager_setup Aug 28, 2024
@stejskalleos
Copy link
Contributor Author

@ekohl I created a new Redmine ticket since the original one was already released in 3.12.
After merge I'll cherry-pick it to 3.12 and update the original ticket

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

@ekohl I created a new Redmine ticket since the original one was already released in 3.12.

3.12 is not GA yet. Please use the original Redmine issue.

This reverts commit aa8f66f.

Original commit breaks multiple features:
* Provisioning of RHEL 8.y machines (https://issues.redhat.com/browse/SAT-27182)
* Templates with heredoc (https://projects.theforeman.org/issues/37741)
@stejskalleos
Copy link
Contributor Author

3.12 is not GA yet.

Oh yeah, the branching was just a few weeks ago.
The commit message has been updated; I will close the new issue.

@stejskalleos stejskalleos changed the title Fixes #37766 - Revert indentation for subscription_manager_setup refs #37433 - Revert indentation for subscription_manager_setup Aug 28, 2024
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Thanks!

@nofaralfasi nofaralfasi merged commit faee8af into theforeman:develop Aug 28, 2024
49 of 52 checks passed
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.

3 participants