Skip to content

Conversation

@Srivaralakshmi
Copy link
Contributor

Original pull request: #29687
Aligned team: DevTools
JIRA ID: RHDEVDOCS-2078
This PR is for OCP 4.6 Only.
This has been reviewed by the SME and QE.

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 3, 2021
@netlify
Copy link

netlify bot commented Mar 3, 2021

Deploy preview for osdocs ready!

Built with commit 3c36880

https://deploy-preview-30067--osdocs.netlify.app

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 3, 2021
@pneedle-rh
Copy link
Contributor

@Srivaralakshmi I have added one small suggestion. Other than that, this LGTM!

@vikram-redhat the automatic 4.6 CP in #29687 failed due to a merge conflict in modules/op-constructing-pipelines-using-pipeline-builder.adoc. I subsequently spent some time on a call with @Srivaralakshmi to explain how to resolve that. This new PR has been created instead of a manual cherry pick, because there are quite a lot of differences in modules/op-constructing-pipelines-using-pipeline-builder.adoc between 4.6 and master. The changes for that file are slightly different in this new PR. From my review, all of the changes in the other files are the same here as per the original PR.

I noticed one small edit that is needed for this new PR. Once @Srivaralakshmi has resolved that, can you please advise if any further approvals are required, or if this can be merged and please then help to progress this. I ask because @Srivaralakshmi mentioned that this content needs to be merged before I get in tomorrow morning.

Thanks!

@pneedle-rh
Copy link
Contributor

@Srivaralakshmi as discussed, please also arrange in another PR for the capitalisation within this assembly (for 4.5+) to be made consistent, in line with these guidelines.

@vikram-redhat
Copy link
Contributor

I noticed one small edit that is needed for this new PR. Once @Srivaralakshmi has resolved that, can you please advise if any further approvals are required, or if this can be merged and please then help to progress this. I ask because @Srivaralakshmi mentioned that this content needs to be merged before I get in tomorrow morning.

Thanks for the detailed note @pneedle-rh. This doesn't require further approvals and I see that @Srivaralakshmi has updated the note. I will merge.

@vikram-redhat vikram-redhat merged commit 71a927e into openshift:enterprise-4.6 Mar 3, 2021
@Srivaralakshmi Srivaralakshmi deleted the pipelines-4-6 branch March 15, 2021 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants