search

blackducksoftware / synopsys-operator

Archived and moved this to https://github.com/blackducksoftware/synopsysctl
Apache License 2.0
10 stars 14 forks source link

add 5.0.2, 5.2.1 and 5.2.2 support #1263

Closed msenmurugan closed 4 years ago

operator-r2d2 commented 4 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msenmurugan

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: - ~~[OWNERS](https://github.com/blackducksoftware/synopsys-operator/blob/saas-2019.12.2/OWNERS)~~ [msenmurugan] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
msenmurugan commented 4 years ago

/cherrypick release-2020.2.x

operator-r2d2 commented 4 years ago

@msenmurugan: #1263 failed to apply on top of branch "release-2020.2.x":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M   pkg/apps/alert/latest/alert_versions.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/apps/alert/latest/alert_versions.go
CONFLICT (content): Merge conflict in pkg/apps/alert/latest/alert_versions.go
Patch failed at 0001 add 5.0.2, 5.2.1 and 5.2.2 support
In response to [this](https://github.com/blackducksoftware/synopsys-operator/pull/1263#issuecomment-591073272): >/cherrypick release-2020.2.x 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.