Skip to content

Revert "Manual backport of 2337 into release/1.1.x"#2588

Merged
skpratt merged 1 commit intorelease/1.1.xfrom
revert-2455-backport-2337-into-release-1.1.x
Jul 19, 2023
Merged

Revert "Manual backport of 2337 into release/1.1.x"#2588
skpratt merged 1 commit intorelease/1.1.xfrom
revert-2455-backport-2337-into-release-1.1.x

Conversation

@skpratt
Copy link
Copy Markdown
Contributor

@skpratt skpratt commented Jul 19, 2023

Reverts #2455
This should not have been backported to 1.1.x (it was labeled incorrectly in #2337), because it changes the RedHat registry ID to the FIPS one. It has been reverted in the other backport branches:
#2504
#2559

@skpratt skpratt added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport signals that a PR will not contain a backport label labels Jul 19, 2023
@skpratt skpratt requested a review from curtbushko July 19, 2023 16:34
@skpratt skpratt marked this pull request as ready for review July 19, 2023 16:34
Copy link
Copy Markdown
Contributor

@curtbushko curtbushko left a comment

Choose a reason for hiding this comment

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

Thanks for reverting these as I was going to look into them today!

@skpratt skpratt enabled auto-merge (squash) July 19, 2023 19:21
@skpratt skpratt merged commit 239c8f5 into release/1.1.x Jul 19, 2023
@skpratt skpratt deleted the revert-2455-backport-2337-into-release-1.1.x branch July 19, 2023 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport signals that a PR will not contain a backport label pr/no-changelog PR does not need a corresponding .changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants