svn commit: r1701572 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java

[mreutegg]

Author: mreutegg
Date: Mon Sep  7 07:29:49 2015
New Revision: 1701572

URL: http://svn.apache.org/r1701572
Log:
OAK-3353: Enable ConcurrentConflictTest.concurrentUpdatesWithBranch()

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java?rev=1701572&r1=1701571&r2=1701572&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java
 Mon Sep  7 07:29:49 2015
@@ -81,7 +81,6 @@ public class ConcurrentConflictTest exte
         return new 
DocumentMK.Builder().setAsyncDelay(10).setDocumentStore(store).open();
     }
 
-    @Ignore
     @Test
     public void concurrentUpdatesWithBranch() throws Exception {
         concurrentUpdates(true);