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

manual merge of https://github.com/uyuni-project/uyuni-docs/pull/487 #533

Closed

Conversation

keichwa
Copy link
Contributor

@keichwa keichwa commented Sep 14, 2020

Description

merge {productname} change from master.
cherry-pick produces too many conflicts; I merged it manually.

Target branches

Which product version does this PR apply to?

  • Manager-4.0
  • Manager-4.1
  • Manager-4.2
  • Uyuni

Links

Fixes #<insert issue or PR link, if any>
Part of https://github.com/SUSE/spacewalk/issues/12185

@Loquacity
Copy link
Contributor

Is there a reason why this needs to be backported?

@keichwa
Copy link
Contributor Author

keichwa commented Sep 15, 2020 via email

@Loquacity
Copy link
Contributor

Loquacity commented Sep 16, 2020

Lana Brindley notifications@github.com writes:
Is there a reason why this needs to be backported?
These changes and fixes can wait. But then now we must pay attention if we have to backport other retails fixes because of the redefined {smr} macro. I do not expect that many Retail fixes for 4.1 ;)

-- Karl Eichwalder

Yup, I found and fixed a few of those in my walkthrough of the 4.1.2 branch: #536

I don't think we need this PR.

@Loquacity Loquacity closed this Sep 17, 2020
@Loquacity Loquacity deleted the retail-use-productname-for-4.1-#12185-keichwa branch September 17, 2020 00:43
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