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 1724028 remove startingCSV line in section 2f #15932

Merged
merged 1 commit into from
Jul 18, 2019

Conversation

bobfuru
Copy link
Contributor

@bobfuru bobfuru commented Jul 18, 2019

Removed line 178 (step 2f): startingCSV: "elasticsearch-operator.v4.1.0"
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1724028
@openshift/team-documentation

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 18, 2019
@kalexand-rh kalexand-rh added this to the Next Release milestone Jul 18, 2019
Copy link
Contributor

@kalexand-rh kalexand-rh left a comment

Choose a reason for hiding this comment

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

The bug says no QE, so LTGM.

@kalexand-rh kalexand-rh merged commit 66ce592 into openshift:master Jul 18, 2019
@kalexand-rh
Copy link
Contributor

/cherrypick enterprise-4.1

@kalexand-rh
Copy link
Contributor

/cherrypick enterprise-4.2

@openshift-cherrypick-robot

@kalexand-rh: #15932 failed to apply on top of branch "enterprise-4.2":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	modules/efk-logging-deploy-subscription.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/efk-logging-deploy-subscription.adoc
CONFLICT (content): Merge conflict in modules/efk-logging-deploy-subscription.adoc
Patch failed at 0001 bug 1724028 remove startingCSV line in section 2f

In response to this:

/cherrypick enterprise-4.2

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

@kalexand-rh: new pull request created: #15935

In response to this:

/cherrypick enterprise-4.1

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.

@vikram-redhat
Copy link
Contributor

vikram-redhat commented Jul 20, 2019

@bobfuru the callout marker and line have been removed, but you also need to remove the callout listing for the marker that you removed: https://github.com/openshift/openshift-docs/pull/15932/files#diff-ed2514a91149983674ad7ff3485f7499R181.

So <3> was removed, but the <3> explanation remains which is not right since there is nothing to correspond it to.

Please submit a new PR to remove the <3> explanation as well.

@vikram-redhat
Copy link
Contributor

And now we also have a bug for it: https://bugzilla.redhat.com/show_bug.cgi?id=1731588 :)

@bobfuru
Copy link
Contributor Author

bobfuru commented Jul 21, 2019

@vikram-redhat I have submitted a new PR per your note and bug 1731588 to remove the callout listing for the callout 3 marker.

@vikram-redhat
Copy link
Contributor

New PR is: #15959

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.1 branch/enterprise-4.2 size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants