Author: mreutegg
Date: Thu Feb 2 13:17:41 2017
New Revision: 1781392
URL: http://svn.apache.org/viewvc?rev=1781392&view=rev
Log:
OAK-5557: incomplete diffManyChildren during commitHook evaluation in a
persisted branch
Merged revision 1781386 from trunk
Added:
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchesTest.java
- copied unchanged from r1781386,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchesTest.java
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 2 13:17:41 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075
+/jackrabbit/oak/trunk:1781068,1781075,1781386
/jackrabbit/trunk:1345480
