Skip to content

OSDOCS-3433: rewrite caveats to address user comments#45818

Merged
stevsmit merged 1 commit intoopenshift:mainfrom
darshan-nagaraj:OSDOCS-3433-update
Aug 23, 2022
Merged

OSDOCS-3433: rewrite caveats to address user comments#45818
stevsmit merged 1 commit intoopenshift:mainfrom
darshan-nagaraj:OSDOCS-3433-update

Conversation

@darshan-nagaraj
Copy link
Contributor

@darshan-nagaraj darshan-nagaraj commented May 18, 2022 •
edited
Loading

Version(s): 4.8+

Issue: Related to #45353

Link to docs preview: https://deploy-preview-45818--osdocs.netlify.app/openshift-enterprise/latest/updating/preparing-eus-eus-upgrade.html

Additional information:

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 18, 2022
@netlify
Copy link

netlify bot commented May 18, 2022 •
edited
Loading

✅ Deploy Preview for osdocs ready!

Name Link
🔨 Latest commit 6ce614d402a08e1e82add6d6102a703e8e9e976c
🔍 Latest deploy log https://app.netlify.com/sites/osdocs/deploys/6285ee187c06430008ed9595
😎 Deploy Preview https://deploy-preview-45818--osdocs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@LalatenduMohanty
Copy link
Member

LalatenduMohanty commented May 18, 2022

/hold I plan to suggest some other wording.

wking
wking reviewed May 18, 2022
View reviewed changes
@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 18, 2022
wking
wking approved these changes Jun 21, 2022
View reviewed changes
Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 21, 2022
LalatenduMohanty
LalatenduMohanty approved these changes Jun 21, 2022
View reviewed changes
Copy link
Member

@LalatenduMohanty LalatenduMohanty left a comment

Choose a reason for hiding this comment

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

/lgtm

@LalatenduMohanty
Copy link
Member

LalatenduMohanty commented Jun 21, 2022

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 21, 2022
kelbrown20
kelbrown20 reviewed Jun 22, 2022
View reviewed changes
Copy link
Contributor

@kelbrown20 kelbrown20 left a comment

Choose a reason for hiding this comment

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

LGTM!

stevsmit
stevsmit reviewed Jun 27, 2022
View reviewed changes
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2022
@openshift-ci
Copy link

openshift-ci bot commented Jul 10, 2022

New changes are detected. LGTM label has been removed.

@bergerhoffer
Copy link
Contributor

bergerhoffer commented Aug 10, 2022

The enterprise-4.12 label has been added to this PR.

This is because your PR targets the main branch and is labeled for enterprise-4.11. And any PR going into main must also target the latest version branch (enterprise-4.12).

If the update in your PR does NOT apply to version 4.12 onward, please re-target this PR to go directly into the appropriate version branch or branches (enterprise-4.x) instead of main.

@stevsmit stevsmit merged commit 0ab3eaa into openshift:main Aug 23, 2022
@stevsmit
Copy link
Member

stevsmit commented Aug 23, 2022

/cherry-pick enterprise-4.8

@stevsmit
Copy link
Member

stevsmit commented Aug 23, 2022

/cherry-pick enterprise-4.9

@stevsmit
Copy link
Member

stevsmit commented Aug 23, 2022

/cherry-pick enterprise-4.10

@stevsmit
Copy link
Member

stevsmit commented Aug 23, 2022

/cherry-pick enterprise-4.11

@stevsmit
Copy link
Member

stevsmit commented Aug 23, 2022

/cherry-pick enterprise-4.12

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Aug 23, 2022

@stevsmit: #45818 failed to apply on top of branch "enterprise-4.8":

Applying: OSDOCS-3433: rewrite caveats to address user comments
Using index info to reconstruct a base tree...
M	updating/preparing-eus-eus-upgrade.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/preparing-eus-eus-upgrade.adoc
CONFLICT (content): Merge conflict in updating/preparing-eus-eus-upgrade.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 OSDOCS-3433: rewrite caveats to address user comments
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:

/cherry-pick 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 openshift-cherrypick-robot mentioned this pull request Aug 23, 2022
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Aug 23, 2022

@stevsmit: new pull request created: #49493

Details

In response to this:

/cherry-pick 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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Aug 23, 2022
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Aug 23, 2022

@stevsmit: new pull request created: #49494

Details

In response to this:

/cherry-pick enterprise-4.10

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
Copy link

openshift-cherrypick-robot commented Aug 23, 2022

@stevsmit: new pull request created: #49495

Details

In response to this:

/cherry-pick enterprise-4.11

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.

This was referenced Aug 23, 2022
Merged
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Aug 23, 2022

@stevsmit: new pull request created: #49496

Details

In response to this:

/cherry-pick enterprise-4.12

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.

@darshan-nagaraj darshan-nagaraj mentioned this pull request Aug 30, 2022
Merged
@bergerhoffer bergerhoffer added this to the Continuous Release milestone Oct 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stevsmit stevsmit stevsmit left review comments

+5 more reviewers

@arthur-r-oliveira arthur-r-oliveira arthur-r-oliveira left review comments

@jiajliu jiajliu jiajliu left review comments

@kelbrown20 kelbrown20 kelbrown20 left review comments

@wking wking wking approved these changes

@LalatenduMohanty LalatenduMohanty LalatenduMohanty approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@wking wking

@LalatenduMohanty LalatenduMohanty

Labels

branch/enterprise-4.8 branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

Continuous Release

Development

Successfully merging this pull request may close these issues.

9 participants

@darshan-nagaraj @LalatenduMohanty @bergerhoffer @stevsmit @openshift-cherrypick-robot @wking @arthur-r-oliveira @jiajliu @kelbrown20