Skip to content

Conversation

bobfuru
Copy link
Contributor

@bobfuru bobfuru commented Jun 22, 2020

Fix for 4.2 CP merge conflict in #23087
Also relates to fix in #23197

@bobfuru bobfuru added this to the Next Release milestone Jun 22, 2020
Copy link
Contributor

@Preeticp Preeticp Jun 23, 2020

Choose a reason for hiding this comment

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

Hi @bobfuru we need to add a space between kube- and 'are'. The formatting has gone awry cause of this problem. I have raised another PR to fix this in 4.3, 4.4, and 4.5. If you could add that space here for 4.2 and then merge, it would be great. Also, request you to please merge the PR for this change for the other versions: #23197
I am sorry I did not see this earlier :(

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No worries, @Preeticp! I have fixed the space issue and also made the update on line 8 (namespace -> cluster). Will merge this now, along with related #23197.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you!!

@bobfuru bobfuru merged commit eb32806 into openshift:enterprise-4.2 Jun 23, 2020
@bobfuru bobfuru deleted the pr23087-cp-4-2 branch June 23, 2020 20:18
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.

2 participants