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 re...@apache.org on 2023/06/13 16:00:25 UTC

[jackrabbit-oak] 01/01: Merge remote-tracking branch 'origin/trunk' into OAK-10274

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

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

commit ce1f766a4f925a1b0f1480153e360629d0373850
Merge: 98a7335468 b36f96adcf
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Jun 13 17:00:09 2023 +0100

    Merge remote-tracking branch 'origin/trunk' into OAK-10274

 .../oak/benchmark/AccessAfterMoveTest.java         |  71 +++++++
 .../jackrabbit/oak/benchmark/BenchmarkRunner.java  |   3 +-
 .../main/java/org/apache/jackrabbit/oak/Oak.java   |   6 +-
 .../jackrabbit/oak/core/ContentRepositoryImpl.java |  11 +-
 .../jackrabbit/oak/core/ContentSessionImpl.java    |   9 +-
 .../apache/jackrabbit/oak/core/MutableRoot.java    | 125 ++++++++++--
 .../org/apache/jackrabbit/oak/core/SystemRoot.java |   4 +-
 .../org/apache/jackrabbit/oak/core/MoveTest.java   | 218 +++++++++++++++++----
 .../jackrabbit/oak/core/MutableRootTest.java       |   3 +-
 .../org/apache/jackrabbit/oak/core/RootTest.java   |  16 ++
 .../jackrabbit/oak/jcr/TransientMoveTest.java      |   7 +-
 .../persistentcache/PersistentRedisCacheTest.java  |   2 +-
 oak-shaded-guava/pom.xml                           |   4 +-
 .../oak/plugins/memory/MemoryNodeBuilder.java      |   7 +-
 14 files changed, 416 insertions(+), 70 deletions(-)