Generated by
JDiff

Package org.apache.jackrabbit.oak.spi.commit

Added Classes and Interfaces
ConflictHandlers  
ObserverTracker  
ResetCommitAttributeHook  
SimpleCommitContext  
ThreeWayConflictHandler A {@code ThreeWayConflictHandler} is responsible for handling conflicts which happen on org.apache.jackrabbit.oak.api.Root.rebase() and on the implicit rebase operation which takes part on org.apache.jackrabbit.oak.api.Root.commit().
ThreeWayConflictHandler.
Resolution
Resolutions for conflicts
WhiteboardEditorProvider Dynamic EditorProvider based on the available whiteboard services.
 

Changed Classes and Interfaces
CompositeConflictHandler A {@code CompositeConflictHandler} delegates conflict handling to multiple backing handlers.
ConflictHandler A {@code ConflictHandler} is responsible for handling conflicts which happen on org.apache.jackrabbit.oak.api.Root.rebase() and on the implicit rebase operation which takes part on org.apache.jackrabbit.oak.api.Root.commit().
PartialConflictHandler A {@code PartialConflictHandler} is responsible for handling conflicts which happen on org.apache.jackrabbit.oak.api.Root.rebase() and on the implicit rebase operation which takes part on org.apache.jackrabbit.oak.api.Root.commit().
ProgressNotificationEditor This {@code Editor} instance logs invocations to the logger passed to its constructor after each 10000 calls to it {@code enter()} method.