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

Fix: config merger fixes #2084

Merged
merged 3 commits into from
Nov 5, 2022
Merged

Fix: config merger fixes #2084

merged 3 commits into from
Nov 5, 2022

Conversation

qjebbs
Copy link
Contributor

@qjebbs qjebbs commented Oct 19, 2022

The PR fixes bugs of config mergers

@codecov-commenter
Copy link

codecov-commenter commented Oct 19, 2022

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 46.15385% with 7 lines in your changes missing coverage. Please review.

Project coverage is 38.89%. Comparing base (0cd219f) to head (0a1e1a6).
Report is 339 commits behind head on master.

Files with missing lines Patch % Lines
infra/conf/mergers/merger_base.go 0.00% 3 Missing ⚠️
infra/conf/merge/map.go 75.00% 1 Missing and 1 partial ⚠️
infra/conf/mergers/merge.go 0.00% 2 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2084      +/-   ##
==========================================
- Coverage   38.90%   38.89%   -0.01%     
==========================================
  Files         616      616              
  Lines       36508    36512       +4     
==========================================
- Hits        14204    14202       -2     
- Misses      20715    20720       +5     
- Partials     1589     1590       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@qjebbs qjebbs force-pushed the conf_merger_fixes branch from 51b28a2 to 0a1e1a6 Compare October 19, 2022 09:39
@kslr kslr changed the title config merger fixes Fix: config merger fixes Nov 5, 2022
@kslr kslr merged commit 9bbc3af into v2fly:master Nov 5, 2022
maskedeken pushed a commit to maskedeken/v2ray-core that referenced this pull request Mar 10, 2023
…acters (v2fly#1988)

Chore: bump github.com/jhump/protoreflect from 1.13.0 to 1.14.0 (v2fly#2104)

Bumps [github.com/jhump/protoreflect](https://github.com/jhump/protoreflect) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/jhump/protoreflect/releases)
- [Commits](jhump/protoreflect@v1.13.0...v1.14.0)

---
updated-dependencies:
- dependency-name: github.com/jhump/protoreflect
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Fix: logic of domain override

Chore: bump github.com/lucas-clemente/quic-go from 0.29.2 to 0.31.0 (v2fly#2157)

Bumps [github.com/lucas-clemente/quic-go](https://github.com/lucas-clemente/quic-go) from 0.29.2 to 0.31.0.
- [Release notes](https://github.com/lucas-clemente/quic-go/releases)
- [Changelog](https://github.com/lucas-clemente/quic-go/blob/master/Changelog.md)
- [Commits](quic-go/quic-go@v0.29.2...v0.31.0)

---
updated-dependencies:
- dependency-name: github.com/lucas-clemente/quic-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Fix: HTTP sniff

Fix: config merger fixes (v2fly#2084)

Test: fix leastload strategy unit test

fix selectLeastLoad() returns wrong number of nodes (v2fly#2083)

Chore: bump quic-go from 0.29.1 to 0.29.2 (v2fly#2064)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants