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

enhance: [2.4] Resolve conflict cpp format #35129

Merged
merged 1 commit into from
Jul 31, 2024

Conversation

congqixia
Copy link
Contributor

See also #35073 #35119

See also milvus-io#35073 milvus-io#35119

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
@sre-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: congqixia

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

@sre-ci-robot sre-ci-robot added size/XS Denotes a PR that changes 0-9 lines. approved labels Jul 31, 2024
@mergify mergify bot added the dco-passed DCO check passed. label Jul 31, 2024
Copy link
Contributor

mergify bot commented Jul 31, 2024

@congqixia Please associate the related pr of master to the body of your Pull Request. (eg. “pr: #”)

@mergify mergify bot added do-not-merge/missing-related-pr kind/enhancement Issues or changes related to enhancement labels Jul 31, 2024
@congqixia
Copy link
Contributor Author

/kind branch-feature

@weiliu1031
Copy link
Contributor

/lgtm

Copy link

codecov bot commented Jul 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.81%. Comparing base (935a117) to head (86fe58e).
Report is 3 commits behind head on 2.4.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##              2.4   #35129      +/-   ##
==========================================
+ Coverage   81.13%   84.81%   +3.67%     
==========================================
  Files        1047      786     -261     
  Lines      137035   113315   -23720     
==========================================
- Hits       111188    96108   -15080     
+ Misses      21651    13004    -8647     
- Partials     4196     4203       +7     

see 299 files with indirect coverage changes

@mergify mergify bot added the ci-passed label Jul 31, 2024
@sre-ci-robot sre-ci-robot merged commit f5d0e55 into milvus-io:2.4 Jul 31, 2024
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved ci-passed dco-passed DCO check passed. kind/branch-feature kind/enhancement Issues or changes related to enhancement lgtm size/XS Denotes a PR that changes 0-9 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants