You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2023/01/05 14:57:30 UTC

[jackrabbit-oak] branch trunk updated (af958d39ce -> bb7ad2fe46)

This is an automated email from the ASF dual-hosted git repository.

mreutegg pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


    from af958d39ce OAK-10051 attach correct artifact (#810)
     new f1faa48844 OAK-10031 : purge uncommitted revisions and collisions in batches on boot up
     new e84a0b14a3 OAK-10031 : fixed logic to merge updateOps in batches
     new bb7ad2fe46 Merge pull request #796 from rishabhdaim/OAK-10031

The 18189 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../oak/plugins/document/DocumentNodeStore.java    |  7 ++-
 .../oak/plugins/document/NodeDocument.java         | 40 +++++++++++----
 .../oak/plugins/document/UnmergedBranches.java     |  7 +--
 .../oak/plugins/document/NodeDocumentTest.java     | 57 ++++++++++++++++++++++
 4 files changed, 97 insertions(+), 14 deletions(-)