Skip to content

BZ-1920414: Clarifying the revision numbers are examples#30077

Merged
bergerhoffer merged 1 commit intoopenshift:masterfrom
bergerhoffer:BZ1920414
Mar 4, 2021
Merged

BZ-1920414: Clarifying the revision numbers are examples#30077
bergerhoffer merged 1 commit intoopenshift:masterfrom
bergerhoffer:BZ1920414

Conversation

@bergerhoffer bergerhoffer added this to the Next Release milestone Mar 3, 2021
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 3, 2021
@netlify
Copy link
Copy Markdown

netlify Bot commented Mar 3, 2021

Deploy preview for osdocs ready!

Built with commit 8241f09

https://deploy-preview-30077--osdocs.netlify.app

@bergerhoffer
Copy link
Copy Markdown
Contributor Author

@retroflexer @geliu2016 Can you please review this update? It's to make it clearer that the revision number didn't have to be 3, that 3 was just the revision in this example. I changed it to 7, so they didn't think it had to match the number of nodes or anything either.

Preview: https://deploy-preview-30077--osdocs.netlify.app/openshift-enterprise/latest/backup_and_restore/disaster_recovery/scenario-2-restoring-cluster-state.html

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

I have a couple of suggestions, but this change is looking good!

Comment thread modules/dr-restoring-cluster-state.adoc Outdated
Comment thread modules/dr-restoring-cluster-state.adoc Outdated
@kalexand-rh kalexand-rh 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 Mar 3, 2021
@geliu2016
Copy link
Copy Markdown

LGTM, thanks

@bergerhoffer bergerhoffer merged commit 2ae01cd into openshift:master Mar 4, 2021
@bergerhoffer
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.8

@bergerhoffer
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.7

@bergerhoffer
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.6

@bergerhoffer
Copy link
Copy Markdown
Contributor Author

/cherrypick enterprise-4.5

@openshift-cherrypick-robot
Copy link
Copy Markdown

@bergerhoffer: new pull request created: #30109

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

@bergerhoffer: new pull request created: #30110

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

@bergerhoffer: new pull request created: #30111

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

@bergerhoffer: #30077 failed to apply on top of branch "enterprise-4.5":

Applying: BZ-1920414: Clarifying the revision numbers are examples
Using index info to reconstruct a base tree...
M	modules/dr-restoring-cluster-state.adoc
A	modules/nodes-nodes-audit-policy.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/nodes-nodes-audit-policy.adoc deleted in HEAD and modified in BZ-1920414: Clarifying the revision numbers are examples. Version BZ-1920414: Clarifying the revision numbers are examples of modules/nodes-nodes-audit-policy.adoc left in tree.
Auto-merging modules/dr-restoring-cluster-state.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 BZ-1920414: Clarifying the revision numbers are examples
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.5

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.5 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

Development

Successfully merging this pull request may close these issues.

5 participants