Skip to content

Conversation

@ousleyp
Copy link
Member

@ousleyp ousleyp commented Feb 20, 2021

@stu-gott and @tiraboschi please confirm these version numbers - thanks!

Note: Simone, the HCOVersion attribute is used in places like the following:

@ousleyp ousleyp added CNV Label for all CNV PRs branch/enterprise-4.7 labels Feb 20, 2021
@ousleyp ousleyp added this to the Future Release milestone Feb 20, 2021
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 20, 2021
@netlify
Copy link

netlify bot commented Feb 20, 2021

Deploy preview for osdocs ready!

Built with commit 964428d

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

Copy link
Contributor

@aburdenthehand aburdenthehand left a comment

Choose a reason for hiding this comment

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

lgtm

@aburdenthehand aburdenthehand merged commit 85c9c8f into openshift:master Feb 22, 2021
@aburdenthehand
Copy link
Contributor

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot

@aburdenthehand: #29635 failed to apply on top of branch "enterprise-4.7":

Applying: version number attributes for CNV 2.6
Using index info to reconstruct a base tree...
M	modules/virt-document-attributes.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/virt-document-attributes.adoc
CONFLICT (content): Merge conflict in modules/virt-document-attributes.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 version number attributes for CNV 2.6
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".

Details

In response to this:

/cherry-pick 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.7 CNV Label for all CNV PRs 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.

7 participants