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 st...@apache.org on 2021/09/07 07:43:36 UTC

[jackrabbit-oak] 01/01: Merge branch 'trunk' into trunk

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

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

commit dc85a37d8fb2136c38642d4a65a25f89b49dcda6
Merge: 874cc4d d6dfd01
Author: stefan-egli <st...@apache.org>
AuthorDate: Tue Sep 7 09:43:30 2021 +0200

    Merge branch 'trunk' into trunk

 Jenkinsfile                                                         | 6 +++---
 .../jackrabbit/oak/plugins/document/LargeMergeRecoveryTest.java     | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)