You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2025/01/06 22:27:51 UTC
(couchdb) branch reduce-intra-cluster-conflicts updated (79f92d71f -> ef74641a9)
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a change to branch reduce-intra-cluster-conflicts
in repository https://gitbox.apache.org/repos/asf/couchdb.git
discard 79f92d71f reject write at leader if conflict
discard 0caafd200 delay start of 'follower' shards
discard b9bfa4cc7 introduce acc record
add 9f3d8cabd chore(ci): Use Bookworm for "Build Release Tarball" stage (#5378)
add 2f481275c introduce acc record
add b4add4caf delay start of 'follower' shards
add ef74641a9 reject write at leader if conflict
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (79f92d71f)
\
N -- N -- N refs/heads/reduce-intra-cluster-conflicts (ef74641a9)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
build-aux/Jenkinsfile.full | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)