Skip to content

Conversation

@abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Feb 10, 2021

No description provided.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 10, 2021
@netlify
Copy link

netlify bot commented Feb 10, 2021

Deploy preview for osdocs ready!

Built with commit 999bd4c

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

@abrennan89 abrennan89 force-pushed the RHDEVDOCS2334 branch 2 times, most recently from 1ea4997 to 420e3e3 Compare February 10, 2021 16:47
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 11, 2021
@abrennan89 abrennan89 changed the title [WIP] [RHDEVDOCS-2334] Adding admin console eventing tasks [RHDEVDOCS-2334] Adding admin console eventing tasks Feb 11, 2021
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 11, 2021
Copy link
Contributor

@cardil cardil left a comment

Choose a reason for hiding this comment

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

/lgtm

from QE

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2021
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2021
@Preeticp
Copy link
Contributor

@invincibleJai can you please take a look at this PR?

@invincibleJai
Copy link
Member

Thanks , looks good to me.

@ahardin-rh ahardin-rh added dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs peer-review-done Signifies that the peer review team has reviewed this PR labels Feb 16, 2021
@ahardin-rh
Copy link
Contributor

Just a suggestion from me. Looks good!

Copy link
Contributor

@vikram-redhat vikram-redhat left a comment

Choose a reason for hiding this comment

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

lgtm for merging

@vikram-redhat vikram-redhat merged commit 4135ba0 into openshift:enterprise-4.7 Feb 16, 2021
@vikram-redhat
Copy link
Contributor

/cherrypick master

@openshift-cherrypick-robot

@vikram-redhat: #29367 failed to apply on top of branch "master":

Applying: Adding admin console eventing tasks
Using index info to reconstruct a base tree...
M	_topic_map.yml
M	modules/serverless-install-web-console.adoc
A	serverless/admin_guide/serverless-cluster-admin-eventing.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): serverless/admin_guide/serverless-cluster-admin-eventing.adoc deleted in HEAD and modified in Adding admin console eventing tasks. Version Adding admin console eventing tasks of serverless/admin_guide/serverless-cluster-admin-eventing.adoc left in tree.
Auto-merging modules/serverless-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/serverless-install-web-console.adoc
Auto-merging _topic_map.yml
CONFLICT (content): Merge conflict in _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 Adding admin console eventing tasks
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 master

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 deleted the RHDEVDOCS2334 branch December 17, 2021 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.7 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs 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

Development

Successfully merging this pull request may close these issues.

8 participants