Dave Ward 3207b61c1c Merged V4.1-BUG-FIX to HEAD ...

43364: ALF-16573: LDAP synchronization fails when a child group has more than one parent
   - Correction to previous fix
   - Spring was already correctly recognizing and wrapping the exception as a DeadlockLoserDataAccessException, which is already a ConcurrencyFailureException, so the correct fix was just to rethrow all ConcurrencyFailureExceptions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2012-11-03 14:16:47 +00:00

..

activities

Merged V4.1-BUG-FIX to HEAD

2012-10-16 14:20:20 +00:00

audit

AuditDAO test applications have GUID names; timestamp names may have caused overlap

2011-09-08 04:45:16 +00:00

avm

Merged V4.0-BUG-FIX to HEAD

2012-02-15 17:22:40 +00:00

contentdata

ALF-11957: Fixed merge issues

2011-12-09 13:25:02 +00:00

control

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

encoding

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

hibernate/dialect

Merged V4.1-BUG-FIX to HEAD

2012-08-09 16:37:33 +00:00

locale

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

locks

Prevent testConcurrentLockAcquisition from running due to random and frequent failure.

2011-08-02 11:04:07 +00:00

mimetype

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

node

Merged V4.1-BUG-FIX to HEAD

2012-11-03 14:16:47 +00:00

patch

Merged V4.0-BUG-FIX to HEAD

2012-02-13 12:24:24 +00:00

permissions

Merged V4.0-BUG-FIX to HEAD

2012-05-08 12:07:00 +00:00

propval

Use java.util.Arrays, trying to move away from BouncyCastle

2012-08-16 12:04:28 +00:00

qname

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

query

Fix for ALF-7241:

2011-10-19 09:01:34 +00:00

schema

ALF-16098: Upgraded Activiti to version 5.10

2012-09-28 07:07:03 +00:00

solr

Merged V4.1-BUG-FIX to HEAD

2012-10-16 14:20:20 +00:00

subscriptions

Merged V4.1-BUG-FIX to HEAD

2012-08-28 13:37:05 +00:00

tenant

Merged V4.0-BUG-FIX to HEAD

2012-05-08 12:07:00 +00:00

usage

Merged V4.1-BUG-FIX to HEAD

2012-09-12 19:10:54 +00:00

CrcHelper.java

ALF-2031 - DR and VT can't start

2010-03-16 15:05:47 +00:00

DomainTestSuite.java

Merged V4.0-BUG-FIX to HEAD

2012-04-19 15:43:03 +00:00

PropertyValue.java

Changed metadata encryption to have a new dictionary type: d:encrypted

2011-06-20 11:50:37 +00:00

PropertyValueTest.java

Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:

2010-06-17 19:35:49 +00:00