Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MIG-813: MTC 1.6.0 release notes #36096

Merged
merged 1 commit into from
Sep 19, 2021
Merged

Conversation

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 5, 2021
@apinnick apinnick marked this pull request as draft September 5, 2021 14:27
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 5, 2021
@apinnick apinnick added this to the Next Release milestone Sep 5, 2021
@netlify
Copy link

netlify bot commented Sep 5, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 06220b9

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/6147030e4ee3b3000820ed15

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

@apinnick apinnick force-pushed the mig-813-mtc-1.6-rn branch 4 times, most recently from d910b51 to b103bc8 Compare September 9, 2021 10:58
@apinnick apinnick marked this pull request as ready for review September 9, 2021 11:00
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 9, 2021
@apinnick
Copy link
Contributor Author

apinnick commented Sep 9, 2021

@xinredhat Please review.

Copy link

@eriknelson eriknelson left a comment

Choose a reason for hiding this comment

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

I'm seeing a blank section for "Technical Changes", what normally goes in this section?

modules/migration-mtc-release-notes-1-6.adoc Outdated Show resolved Hide resolved
modules/migration-mtc-release-notes-1-6.adoc Outdated Show resolved Hide resolved
@apinnick apinnick added peer-review-needed Signifies that the peer review team needs to review this PR qe-approved Signifies that QE has signed off on this PR and removed QE Required labels Sep 9, 2021
@sagidlow
Copy link
Contributor

sagidlow commented Sep 9, 2021

LGTM!

@sagidlow sagidlow added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Sep 9, 2021
Copy link

@eriknelson eriknelson left a comment

Choose a reason for hiding this comment

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

LGTM

@apinnick
Copy link
Contributor Author

@xinredhat Can you review the last item in "known issues"? BZ1963927

@xinredhat
Copy link

LGTM

@apinnick apinnick added peer-review-needed Signifies that the peer review team needs to review this PR qe-approved Signifies that QE has signed off on this PR and removed QE Required labels Sep 13, 2021
Copy link
Contributor

@skrthomas skrthomas left a comment

Choose a reason for hiding this comment

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

LGTM!

@apinnick apinnick added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Sep 14, 2021
@apinnick apinnick removed their assignment Sep 14, 2021
@apinnick apinnick force-pushed the mig-813-mtc-1.6-rn branch 2 times, most recently from 6ae0f3d to e88c70d Compare September 19, 2021 09:29
@apinnick
Copy link
Contributor Author

Releasing with module commented out so that I can create separate PRs for additions to the RN.

@apinnick apinnick merged commit 50fcd31 into openshift:main Sep 19, 2021
@apinnick apinnick deleted the mig-813-mtc-1.6-rn branch September 19, 2021 09:32
@apinnick
Copy link
Contributor Author

/cherrypick enterprise-4.6

@apinnick
Copy link
Contributor Author

/cherrypick enterprise-4.7

@apinnick
Copy link
Contributor Author

/cherrypick enterprise-4.8

@apinnick
Copy link
Contributor Author

/cherrypick enterprise-4.9

@openshift-cherrypick-robot

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

Applying: MIG-813: MTC 1.6.0 release notes
Using index info to reconstruct a base tree...
A	migration_toolkit_for_containers/mtc-release-notes.adoc
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
Auto-merging modules/common-attributes.adoc
CONFLICT (modify/delete): migration_toolkit_for_containers/mtc-release-notes.adoc deleted in HEAD and modified in MIG-813: MTC 1.6.0 release notes. Version MIG-813: MTC 1.6.0 release notes of migration_toolkit_for_containers/mtc-release-notes.adoc left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 MIG-813: MTC 1.6.0 release notes
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".

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: #36096 failed to apply on top of branch "enterprise-4.7":

Applying: MIG-813: MTC 1.6.0 release notes
Using index info to reconstruct a base tree...
M	migration_toolkit_for_containers/mtc-release-notes.adoc
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
Auto-merging modules/common-attributes.adoc
Auto-merging migration_toolkit_for_containers/mtc-release-notes.adoc
CONFLICT (content): Merge conflict in migration_toolkit_for_containers/mtc-release-notes.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 MIG-813: MTC 1.6.0 release notes
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".

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: new pull request created: #36536

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: new pull request created: #36537

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 branch/enterprise-4.9 peer-review-done Signifies that the peer review team has reviewed this PR qe-approved Signifies that QE has signed off on this PR 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.

None yet

6 participants