Skip to content

Conversation

mjpytlak
Copy link
Contributor

@mjpytlak mjpytlak commented Feb 28, 2022

Opened this PR to help @tmalove reconcile conflicts the Azure Stack Hub network customizations assembly she is delivering [1].

Preview
https://deploy-preview-42541--osdocs.netlify.app/openshift-enterprise/latest/installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.html

[1] #42449

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 28, 2022
@netlify
Copy link

netlify bot commented Feb 28, 2022

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: e6301e6

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/621e5987519c930007c23ee7

😎 Browse the preview: https://deploy-preview-42541--osdocs.netlify.app

@mjpytlak mjpytlak force-pushed the tlove-osdocs-3179 branch from e0a069c to e6301e6 Compare March 1, 2022 17:36
@mjpytlak
Copy link
Contributor Author

mjpytlak commented Mar 1, 2022

@tmalove As discussed, this PR resolves all of the merge conflicts. My Azure IPI installation topics are building correctly in your customization assembly.

Please work with @jboxman to close your current PR/delete the respective local branch, and then pull this PR into a local working branching. Please then (1) Update the Module included in the following assemblies list in each of the modules to reference your customization assembly; and (2) work with Jason to verify that your networking-specific content is publishing correctly. As mentioned, Jason can assist you with a peer review and a merge.

After you have created a new PR, please ask Jason to close this PR referencing your new PR. I would do this, but I do not have merge rights.

@tmalove
Copy link
Contributor

tmalove commented Mar 2, 2022

This PR replaces the work that was done on #42449

@openshift-ci
Copy link

openshift-ci bot commented Mar 13, 2022

@mjpytlak: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 13, 2022
@mjpytlak
Copy link
Contributor Author

Closing this PR in favor of #42670.

@mjpytlak mjpytlak closed this Mar 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants