Skip to content

fix: [alb] allow alb merging to occur#916

Merged
crandles merged 3 commits intotrickstercache:mainfrom
crandles:alb-502
Feb 17, 2026
Merged

fix: [alb] allow alb merging to occur#916
crandles merged 3 commits intotrickstercache:mainfrom
crandles:alb-502

Conversation

@crandles
Copy link
Contributor

@crandles crandles commented Feb 16, 2026

Ensure alb response is unmerged (by checking to see if resource is mergeable)

Potential fix for #912

Signed-off-by: Chris Randles <randles.chris@gmail.com>
Signed-off-by: Chris Randles <randles.chris@gmail.com>
Signed-off-by: Chris Randles <randles.chris@gmail.com>
@coveralls
Copy link

Pull Request Test Coverage Report for Build 22074751660

Details

  • 3 of 5 (60.0%) changed or added relevant lines in 2 files are covered.
  • 3 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-0.01%) to 72.043%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/proxy/response/merge/timeseries.go 0 2 0.0%
Files with Coverage Reduction New Missed Lines %
pkg/backends/prometheus/handler_query.go 1 97.83%
pkg/proxy/engines/cache_read.go 2 81.82%
Totals Coverage Status
Change from base Build 22071487246: -0.01%
Covered Lines: 14861
Relevant Lines: 20628

💛 - Coveralls

@crandles crandles marked this pull request as ready for review February 17, 2026 17:28
@crandles crandles requested a review from a team as a code owner February 17, 2026 17:28
@crandles crandles merged commit d197bcf into trickstercache:main Feb 17, 2026
7 checks passed
@crandles crandles deleted the alb-502 branch March 8, 2026 18:57
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.

3 participants