[OAK-3643] ConflictResolutionTest fails occasionally

• Type: Test
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 1.0.23, 1.2.7
• Fix Version/s: 1.0.25, 1.2.9, 1.3.11, 1.4
• Component/s: jcr
• Assignee: Marcel Reutegger
• Reporter: Marcel Reutegger
• Created: 17/Nov/15 08:02
• Updated: 02/Mar/16 15:00
• Resolved: 17/Nov/15 08:24

Description

Failed recently on travis: https://travis-ci.org/apache/jackrabbit-oak/builds/91405008

But failed also a couple of times on Jenkins.