Skip to content

Conversation

@ahardin-rh
Copy link
Contributor

@ahardin-rh ahardin-rh commented May 11, 2021

@ahardin-rh ahardin-rh added this to the Next Release milestone May 11, 2021
@ahardin-rh ahardin-rh self-assigned this May 11, 2021
@openshift-ci openshift-ci bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 11, 2021
@netlify
Copy link

netlify bot commented May 11, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 34d7e7c

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/60b7c802ab30890007137a1b

😎 Browse the preview: https://deploy-preview-32445--osdocs.netlify.app

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2021
@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 2, 2021
@ahardin-rh ahardin-rh requested a review from chaitanyaenr June 2, 2021 17:10
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2021
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 2, 2021
@ahardin-rh ahardin-rh changed the title Clarify that perf scale guidance applies to SDN not OVN PERFSCALE-1081: Clarify that perf scale guidance applies to SDN not OVN Jun 3, 2021
@ahardin-rh
Copy link
Contributor Author

@chaitanyaenr @mffiedler PTAL

@ahardin-rh ahardin-rh requested a review from mffiedler June 3, 2021 21:20
Copy link
Member

@chaitanyaenr chaitanyaenr left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@mffiedler mffiedler left a comment

Choose a reason for hiding this comment

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

LGTM

@ahardin-rh ahardin-rh merged commit 0b01867 into openshift:master Jun 3, 2021
@ahardin-rh
Copy link
Contributor Author

/cherrypick enterprise-4.8

@ahardin-rh
Copy link
Contributor Author

/cherrypick enterprise-4.7

@ahardin-rh
Copy link
Contributor Author

/cherrypick enterprise-4.6

@openshift-cherrypick-robot

@ahardin-rh: new pull request created: #33059

Details

In response to this:

/cherrypick enterprise-4.8

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

@ahardin-rh: #32445 failed to apply on top of branch "enterprise-4.7":

Applying: Clarify that perf scale guidance applies to SDN not OVN
Using index info to reconstruct a base tree...
M	scalability_and_performance/planning-your-environment-according-to-object-maximums.adoc
M	scalability_and_performance/recommended-host-practices.adoc
Falling back to patching base and 3-way merge...
Auto-merging scalability_and_performance/recommended-host-practices.adoc
Auto-merging scalability_and_performance/planning-your-environment-according-to-object-maximums.adoc
CONFLICT (content): Merge conflict in scalability_and_performance/planning-your-environment-according-to-object-maximums.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 Clarify that perf scale guidance applies to SDN not OVN
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:

/cherrypick 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.

@openshift-cherrypick-robot

@ahardin-rh: #32445 failed to apply on top of branch "enterprise-4.6":

Applying: Clarify that perf scale guidance applies to SDN not OVN
Using index info to reconstruct a base tree...
M	scalability_and_performance/planning-your-environment-according-to-object-maximums.adoc
M	scalability_and_performance/recommended-host-practices.adoc
Falling back to patching base and 3-way merge...
Auto-merging scalability_and_performance/recommended-host-practices.adoc
Auto-merging scalability_and_performance/planning-your-environment-according-to-object-maximums.adoc
CONFLICT (content): Merge conflict in scalability_and_performance/planning-your-environment-according-to-object-maximums.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 Clarify that perf scale guidance applies to SDN not OVN
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:

/cherrypick enterprise-4.6

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.6 branch/enterprise-4.7 branch/enterprise-4.8 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.

4 participants