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.

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

Bug 1780629: Move Created case to existing <SuccessStatus> to avoid duplication #3714

Merged

Conversation

rhamilto
Copy link
Member

@rhamilto rhamilto commented Dec 6, 2019

Follow on fix to #3707

@rhamilto rhamilto added this to the v4.4 milestone Dec 6, 2019
@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Dec 6, 2019
@openshift-ci-robot
Copy link
Contributor

@rhamilto: This pull request references Bugzilla bug 1780629, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1780629: Move Created case to existing <SuccessStatus> to avoid duplication

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.

@rhamilto
Copy link
Member Author

rhamilto commented Dec 6, 2019

/cherrypick release-4.3

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 6, 2019
@openshift-cherrypick-robot

@rhamilto: once the present PR merges, I will cherry-pick it on top of release-4.3 in a new PR and assign it to you.

In response to this:

/cherrypick release-4.3

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 openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. component/shared Related to console-shared labels Dec 6, 2019
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 6, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, spadgett

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 3942ac9 into openshift:master Dec 7, 2019
@openshift-ci-robot
Copy link
Contributor

@rhamilto: All pull requests linked via external trackers have merged. Bugzilla bug 1780629 has been moved to the MODIFIED state.

In response to this:

Bug 1780629: Move Created case to existing <SuccessStatus> to avoid duplication

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

@rhamilto: #3714 failed to apply on top of branch "release-4.3":
```Applying: Move Created case to existing `` to avoid duplication
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M frontend/packages/console-shared/src/components/status/Status.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/console-shared/src/components/status/Status.tsx
CONFLICT (content): Merge conflict in frontend/packages/console-shared/src/components/status/Status.tsx
Patch failed at 0001 Move `Created` case to existing `` to avoid duplication


<details>

In response to [this](https://github.com/openshift/console/pull/3714#issuecomment-562724264):

>/cherrypick release-4.3


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

@rhamilto rhamilto deleted the created-status-fix branch December 9, 2019 14:13
@rhamilto
Copy link
Member Author

rhamilto commented Dec 9, 2019

/cherrypick release-4.3

@openshift-cherrypick-robot

@rhamilto: #3714 failed to apply on top of branch "release-4.3":
```Applying: Move Created case to existing `` to avoid duplication
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M frontend/packages/console-shared/src/components/status/Status.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/console-shared/src/components/status/Status.tsx
CONFLICT (content): Merge conflict in frontend/packages/console-shared/src/components/status/Status.tsx
Patch failed at 0001 Move `Created` case to existing `` to avoid duplication


<details>

In response to [this](https://github.com/openshift/console/pull/3714#issuecomment-563364489):

>/cherrypick release-4.3


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

@rhamilto
Copy link
Member Author

/cherrypick release-4.3

@openshift-cherrypick-robot

@rhamilto: new pull request created: #3739

In response to this:

/cherrypick release-4.3

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
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/shared Related to console-shared lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants