Skip to content

Cherry picks from 4.1 to 3.4 - #2505

Merged
borrrden merged 3 commits into
release/3.4from
4.1-3.4_cherry_picks
Jun 19, 2026
Merged

Cherry picks from 4.1 to 3.4#2505
borrrden merged 3 commits into
release/3.4from
4.1-3.4_cherry_picks

Conversation

@borrrden

Copy link
Copy Markdown
Member

All came in as-is without conflict, each has a ticket assigned

snej and others added 2 commits June 19, 2026 14:33
Also fix the expiration torture test to not exit early on the same condition

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@borrrden
borrrden requested a review from pasin June 19, 2026 05:34
@github-actions

github-actions Bot commented Jun 19, 2026

Copy link
Copy Markdown

This is a release branch and commits are restricted.

Please confirm this PR is one of the following:

  • A response to a customer ask
  • A change per our security policy
  • A non-functional change (i.e. changes needed for building an older version)
  • A change that has been granted an exception (please comment)

@borrrden

Copy link
Copy Markdown
Member Author

Fixes for issues found during QE testing

* CBL-8475: Use AtomicRetained in Replicator::Subreplicators

Fixes a race condition when a Replicator is torn down.

* Update fleece submodule

---------

Co-authored-by: Pasin Suriyentrakorn <pasin@couchbase.com>
@borrrden
borrrden force-pushed the 4.1-3.4_cherry_picks branch from 9fb45f4 to 4dee4ba Compare June 19, 2026 05:38
@couchbase couchbase deleted a comment from github-actions Bot Jun 19, 2026
@cbl-bot

cbl-bot commented Jun 19, 2026

Copy link
Copy Markdown

Code Coverage Results:

Type Percentage
branches 64.52
functions 77.43
instantiations 71.03
lines 75.96
regions 72.18

@borrrden

Copy link
Copy Markdown
Member Author

Performance test has been failing lately but it's not related to this PR

@borrrden
borrrden merged commit 3bbbf13 into release/3.4 Jun 19, 2026
9 of 10 checks passed
@borrrden
borrrden deleted the 4.1-3.4_cherry_picks branch June 19, 2026 06:35
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