[
https://issues.apache.org/jira/browse/OAK-3643?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Marcel Reutegger resolved OAK-3643.
-----------------------------------
Resolution: Fixed
Fix Version/s: 1.0.25
1.2.9
1.3.11
Fixed in trunk: http://svn.apache.org/r1714730
Merged into 1.2 branch: http://svn.apache.org/r1714731 and 1.0 branch:
http://svn.apache.org/r1714732
> ConflictResolutionTest fails occasionally
> -----------------------------------------
>
> Key: OAK-3643
> URL: https://issues.apache.org/jira/browse/OAK-3643
> Project: Jackrabbit Oak
> Issue Type: Test
> Components: jcr
> Affects Versions: 1.2.7, 1.0.23
> Reporter: Marcel Reutegger
> Assignee: Marcel Reutegger
> Priority: Minor
> Fix For: 1.3.11, 1.2.9, 1.0.25
>
>
> Failed recently on travis:
> https://travis-ci.org/apache/jackrabbit-oak/builds/91405008
> But failed also a couple of times on Jenkins.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
