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

Bug 1913970 - Remove outdated content [enterprise-4.7] #28437

Merged
merged 1 commit into from
Jan 19, 2021
Merged

Bug 1913970 - Remove outdated content [enterprise-4.7] #28437

merged 1 commit into from
Jan 19, 2021

Conversation

rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Jan 7, 2021

@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 7, 2021
@mburke5678
Copy link
Contributor

LGTM

alanconway
alanconway reviewed Jan 15, 2021
View reviewed changes
Copy link

@alanconway alanconway left a comment •
edited

Choose a reason for hiding this comment

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

LGTM

@rolfedh
Copy link
Contributor Author

rolfedh commented Jan 18, 2021

@alexissolanas @linuxstudio @ptrknvk Please take a look. Thanks.

@rolfedh rolfedh changed the title Bug 1913970 - Remove outdated content Bug 1913970 - Remove outdated content [enterprise-4.7] Jan 18, 2021
@bobfuru bobfuru added the peer-review-done Signifies that the peer review team has reviewed this PR label Jan 18, 2021
@bobfuru
Copy link
Contributor

bobfuru commented Jan 18, 2021

LGTM

@bobfuru bobfuru added this to the Future Release milestone Jan 18, 2021
@bobfuru bobfuru merged commit e86b07d into openshift:master Jan 19, 2021
@bobfuru
Copy link
Contributor

bobfuru commented Jan 19, 2021 •
edited by openshift-ci-robot

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jan 19, 2021 •
edited by openshift-ci-robot

@bobfuru: #28437 failed to apply on top of branch "enterprise-4.7":

Applying: Updates
Using index info to reconstruct a base tree...
M	logging/cluster-logging-upgrading.adoc
M	modules/cluster-logging-updating-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/cluster-logging-updating-logging.adoc
Removing modules/cluster-logging-log-forward-update.adoc
Auto-merging logging/cluster-logging-upgrading.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-upgrading.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 Updates
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.

@bobfuru bobfuru mentioned this pull request Jan 19, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alanconway alanconway alanconway left review comments

Assignees
No one assigned
Labels
branch/enterprise-4.7 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
OCP 4.7 GA
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@rolfedh @mburke5678 @bobfuru @openshift-cherrypick-robot @alanconway @vikram-redhat @openshift-ci-robot