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

OBSDOCS-204: Bug fix for configurable parameter and doc editing #63872

Merged
merged 1 commit into from Sep 1, 2023
Merged

OBSDOCS-204: Bug fix for configurable parameter and doc editing #63872

merged 1 commit into from Sep 1, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Aug 23, 2023 •
edited

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/OBSDOCS-204

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

@abrennan89 abrennan89 added peer-review-needed Signifies that the peer review team needs to review this PR dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 labels Aug 23, 2023
@abrennan89 abrennan89 added this to the Continuous Release milestone Aug 23, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 23, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 23, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-204 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/OBSDOCS-204

Link to docs preview:
TBA

QE review:

  • QE has approved this change.

Additional information:

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-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 23, 2023
@abrennan89 abrennan89 force-pushed the OBSDOCS-204 branch 4 times, most recently from 953a92a to 51f58b0 Compare August 23, 2023 18:20
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Aug 23, 2023 •
edited

🤖 Updated build preview is available at:
https://63872--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/23439

@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 23, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-204 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/OBSDOCS-204

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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

openshift-ci-robot commented Aug 23, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-204 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/OBSDOCS-204

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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.

@abrennan89 abrennan89 changed the title [WIP] OBSDOCS-204: Bug fix for configurable parameter and doc editing OBSDOCS-204: Bug fix for configurable parameter and doc editing Aug 24, 2023
@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 Aug 24, 2023
@abrennan89 abrennan89 force-pushed the OBSDOCS-204 branch 2 times, most recently from 3560b55 to c1b8947 Compare August 29, 2023 15:51
@openshift-ci-robot
Copy link

openshift-ci-robot commented Aug 29, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-204 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/OBSDOCS-204

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 1, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-204 which is a valid jira issue.

In response to this:

Version(s):
4.10+

Issue:
https://issues.redhat.com/browse/OBSDOCS-204

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 1, 2023
@openshift-ci
Copy link

openshift-ci bot commented Sep 1, 2023

New changes are detected. LGTM label has been removed.

mramendi
mramendi reviewed Sep 1, 2023
View reviewed changes
logging/cluster-logging-loki.adoc Outdated Show resolved Hide resolved
logging/cluster-logging-loki.adoc Outdated Show resolved Hide resolved
modules/loki-rate-limit-errors.adoc Outdated Show resolved Hide resolved
modules/loki-rate-limit-errors.adoc Outdated Show resolved Hide resolved
modules/loki-rate-limit-errors.adoc Outdated Show resolved Hide resolved
modules/loki-rate-limit-errors.adoc Show resolved Hide resolved
modules/loki-rate-limit-errors.adoc Show resolved Hide resolved
modules/loki-rate-limit-errors.adoc Outdated Show resolved Hide resolved
modules/loki-rate-limit-errors.adoc Outdated Show resolved Hide resolved
@abrennan89 abrennan89 force-pushed the OBSDOCS-204 branch 2 times, most recently from 93f7839 to 4f60a27 Compare September 1, 2023 15:54
@abrennan89 abrennan89 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 1, 2023
@abrennan89 abrennan89 merged commit 6fd3873 into openshift:main Sep 1, 2023
1 check passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.10

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.11

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.12

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.13

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link

@abrennan89: #63872 failed to apply on top of branch "enterprise-4.10":

Applying: OBSDOCS-204: Bug fix for configurable parameter and doc editing
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	logging/cluster-logging-external.adoc
M	logging/cluster-logging-loki.adoc
M	modules/cluster-logging-loki-deploy.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-troubleshooting-loki-entry-out-of-order-errors.adoc
Auto-merging modules/cluster-logging-loki-deploy.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-loki-deploy.adoc
Auto-merging logging/cluster-logging-loki.adoc
Auto-merging logging/cluster-logging-external.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-204: Bug fix for configurable parameter and doc editing
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.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

@abrennan89: #63872 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-204: Bug fix for configurable parameter and doc editing
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	logging/cluster-logging-external.adoc
M	modules/cluster-logging-loki-deploy.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-troubleshooting-loki-entry-out-of-order-errors.adoc
Auto-merging modules/cluster-logging-loki-deploy.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-loki-deploy.adoc
Auto-merging logging/cluster-logging-external.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_osd.yml
Auto-merging _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OBSDOCS-204: Bug fix for configurable parameter and doc editing
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.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.

@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #64231

In response to this:

/cherrypick 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.

This was referenced Sep 1, 2023
Merged
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #64232

In response to this:

/cherrypick enterprise-4.13

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 Sep 1, 2023
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #64233

In response to this:

/cherrypick enterprise-4.14

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 Sep 1, 2023
Merged
Merged
@abrennan89 abrennan89 deleted the OBSDOCS-204 branch September 18, 2023 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xperimental xperimental xperimental left review comments

@JoaoBraveCoding JoaoBraveCoding JoaoBraveCoding left review comments

@mramendi mramendi mramendi left review comments

@kabirbhartiRH kabirbhartiRH kabirbhartiRH left review comments

Assignees

@kabirbhartiRH kabirbhartiRH

Labels
branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @kabirbhartiRH @openshift-cherrypick-robot @xperimental @JoaoBraveCoding @mramendi