MTC 1.5.1 RN

[apinnick]

No BZ or Jira #

Added technological changes for 1.5.1 to RN.

4.6+

Preview: https://deploy-preview-35886--osdocs.netlify.app/openshift-enterprise/latest/migration_toolkit_for_containers/mtc-release-notes?utm_source=github&utm_campaign=bot_dp#technical-changes-1-5_mtc-release-notes

QE approved. Ready for peer review

[apinnick]

@xinredhat Ready for QE.

[netlify]

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 7a0a3cb

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/612cdb0126b15b0008166592

😎 Browse the preview: https://deploy-preview-35886--osdocs.netlify.app/openshift-enterprise/latest/migration_toolkit_for_containers/mtc-release-notes

[apinnick]

/cherrypick enterprise-4.6

[apinnick]

/cherrypick enterprise-4.7

[apinnick]

/cherrypick enterprise-4.8

[apinnick]

/cherrypick enterprise-4.9

[openshift-cherrypick-robot]

@apinnick: #35886 failed to apply on top of branch "enterprise-4.6":

Applying: mtc 1.5.1 RN
Using index info to reconstruct a base tree...
M	modules/common-attributes.adoc
A	modules/migration-mtc-release-notes-1-5.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/migration-mtc-release-notes-1-5.adoc deleted in HEAD and modified in mtc 1.5.1 RN. Version mtc 1.5.1 RN of modules/migration-mtc-release-notes-1-5.adoc left in tree.
Auto-merging modules/common-attributes.adoc
CONFLICT (content): Merge conflict in modules/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 mtc 1.5.1 RN
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.6

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-cherrypick-robot]

@apinnick: #35886 failed to apply on top of branch "enterprise-4.7":

Applying: mtc 1.5.1 RN
Using index info to reconstruct a base tree...
M	modules/common-attributes.adoc
A	modules/migration-mtc-release-notes-1-5.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/migration-mtc-release-notes-1-5.adoc deleted in HEAD and modified in mtc 1.5.1 RN. Version mtc 1.5.1 RN of modules/migration-mtc-release-notes-1-5.adoc left in tree.
Auto-merging modules/common-attributes.adoc
CONFLICT (content): Merge conflict in modules/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 mtc 1.5.1 RN
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.7

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-cherrypick-robot]

@apinnick: #35886 failed to apply on top of branch "enterprise-4.8":

Applying: mtc 1.5.1 RN
Using index info to reconstruct a base tree...
M	modules/common-attributes.adoc
M	modules/migration-mtc-release-notes-1-5.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/migration-mtc-release-notes-1-5.adoc
CONFLICT (content): Merge conflict in modules/migration-mtc-release-notes-1-5.adoc
Auto-merging modules/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 mtc 1.5.1 RN
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.8

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-cherrypick-robot]

@apinnick: #35886 failed to apply on top of branch "enterprise-4.9":

Applying: mtc 1.5.1 RN
Using index info to reconstruct a base tree...
M	modules/common-attributes.adoc
M	modules/migration-mtc-release-notes-1-5.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/migration-mtc-release-notes-1-5.adoc
CONFLICT (content): Merge conflict in modules/migration-mtc-release-notes-1-5.adoc
Auto-merging modules/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 mtc 1.5.1 RN
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.9

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.