This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-10741
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
discard ae45ea5935 OAK-10741 : added error log to normal logger
discard ba003d64de OAK-10741 : added separate logger for detailed gc
add c710cd698b OAK-10743 : gap orphan mode introduced - gc modes added,
refined and … (#1404)
add a3a9e29cb9 OAK-10741 : added separate logger for detailed gc
add 16f703d8d2 OAK-10741 : added error log to normal logger
add cb6c9cdc9f OAK-10741 : handled merge conflicts
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 (ae45ea5935)
\
N -- N -- N refs/heads/OAK-10741 (cb6c9cdc9f)
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:
.../document/NodeDocumentRevisionCleaner.java | 33 +-
.../plugins/document/VersionGarbageCollector.java | 149 ++++-
.../oak/plugins/document/BranchCommitGCTest.java | 259 ++++++---
.../oak/plugins/document/DetailGCHelper.java | 9 +-
.../document/VersionGarbageCollectorIT.java | 603 ++++++++++++++++-----
5 files changed, 803 insertions(+), 250 deletions(-)
