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.

Sign up for GitHub

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

Jump to bottom

BZ1915234 Button says *Save* instead of *Update*. #29663

Merged
merged 1 commit into from Jun 10, 2021
Merged

BZ1915234 Button says *Save* instead of *Update*. #29663

merged 1 commit into from Jun 10, 2021

Conversation

stoobie
Copy link
Contributor

@stoobie stoobie commented Feb 22, 2021 •
edited

https://bugzilla.redhat.com/show_bug.cgi?id=1915234
enterprise 4.8
enterprise 4.7
enterprise 4.6

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

netlify bot commented Feb 22, 2021 •
edited

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: f038011

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/60c21e45bfbb3c000776187d

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

kalexand-rh
kalexand-rh reviewed Feb 22, 2021
View reviewed changes
Copy link
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

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

This change LGTM!

@kalexand-rh kalexand-rh added branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR labels Feb 22, 2021
@kalexand-rh kalexand-rh added this to the Next Release milestone Feb 22, 2021
mgold1234
mgold1234 reviewed Feb 24, 2021
View reviewed changes
modules/update-upgrading-web.adoc Outdated
and click *Update*.
The *Update Status* changes to `Update to <product-version> in progress`, and you can review the progress of the cluster update by watching the progress bars for the Operators and nodes.
and click *Save*.
*Update Status* changes to *Update to <product-version> in progress*, and you can review the progress of the cluster update by watching the progress bars for the Operators and nodes.
Copy link

Choose a reason for hiding this comment

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

Update Status- in the ui it appears with small 's' letter. Update status

Copy link

Choose a reason for hiding this comment

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

*Select Channel- appears with small 'c' letter.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mgold1234 Fixed. Please check and approve the changes.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 25, 2021
@stoobie stoobie changed the title BZ195234 Button says *Save* instead of *Update*. BZ1915234 Button says *Save* instead of *Update*. Mar 4, 2021
@openshift-bot
Copy link

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 2, 2021
@kalexand-rh
Copy link
Contributor

@mgold1234, PTAL?

@stoobie
Copy link
Contributor Author

stoobie commented Jun 7, 2021

/remove-lifecycle stale

@openshift-ci openshift-ci bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 7, 2021
@mgold1234
Copy link

mgold1234 commented Jun 8, 2021 •
edited

image
please change as we talked

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 8, 2021
@stoobie stoobie force-pushed the BZ1915234 branch 2 times, most recently from bb8f77f to 0f4093b Compare June 8, 2021 09:40
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 8, 2021
@bergerhoffer bergerhoffer merged commit 905706e into openshift:master Jun 10, 2021
@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.8

@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.7

@bergerhoffer
Copy link
Contributor

/cherrypick enterprise-4.6

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 10, 2021
Merged
@openshift-cherrypick-robot
Copy link

@bergerhoffer: new pull request created: #33329

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

@bergerhoffer: new pull request created: #33330

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 openshift-cherrypick-robot mentioned this pull request Jun 10, 2021
Merged
@openshift-cherrypick-robot
Copy link

@bergerhoffer: #29663 failed to apply on top of branch "enterprise-4.6":

Applying: BZ195234 Changed button description to *Save* instead of *Update*, to match GUI.
Using index info to reconstruct a base tree...
M	modules/update-upgrading-web.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/update-upgrading-web.adoc
CONFLICT (content): Merge conflict in modules/update-upgrading-web.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 BZ195234 Changed button description to *Save* instead of *Update*, to match GUI.
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.

@bergerhoffer
Copy link
Contributor

@stoobie The cherry pick to 4.6 failed due to a conflict. Can you please submit a manual cherry pick for it?

stoobie added a commit to stoobie/openshift-docs that referenced this pull request Jun 14, 2021
@stoobie
BZ1915234-4.6 Manually adding changes from pull request openshift#29663…
dbc4286 
… from stoobie/BZ1915234 because cherry-pick was not working
@stoobie stoobie mentioned this pull request Jun 14, 2021
Merged
bergerhoffer added a commit that referenced this pull request Jun 21, 2021
@bergerhoffer
Merge pull request #33393 from stoobie/BZ1915234-4.6
797e1cd 
BZ1915234-4.6 Manually adding changes from pull request #29663
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kalexand-rh kalexand-rh kalexand-rh left review comments

@mgold1234 mgold1234 mgold1234 left review comments

@aburdenthehand aburdenthehand Awaiting requested review from aburdenthehand

@codyhoag codyhoag Awaiting requested review from codyhoag

@jeana-redhat jeana-redhat Awaiting requested review from jeana-redhat

@vikram-redhat vikram-redhat Awaiting requested review from vikram-redhat

Assignees
No one assigned
Labels
branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
Next Release
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@stoobie @openshift-bot @kalexand-rh @mgold1234 @bergerhoffer @openshift-cherrypick-robot @openshift-ci-robot