Steven Glover a11c8778e9 Reverse Merge: ...

MNT-15135 "Alfresco Media Management: Rendition Concurrency Failure on Property update"

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2016-09-19 10:23:19 +00:00

..

conditions

Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N

2016-08-22 14:33:09 +00:00

script

…

AddFailedThumbnailActionExecuter.java

Merged https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/AMUKHA/5.2.N-MNT-15135 to 5.2.N

2016-08-22 14:33:09 +00:00

CreateThumbnailActionExecuter.java

…

FailedThumbnailSourceAspect.java

…

FailureHandlingOptions.java

…

SimpleThumbnailer.java

…

ThumbnailDefinition.java

…

ThumbnailDefinitionSpringRegisterer.java

…

ThumbnailHelper.java

…

ThumbnailRegistry.java

Merged 5.2.N (5.2.1) to HEAD (5.2)

2016-08-09 13:56:54 +00:00

ThumbnailRenditionConvertor.java

…

ThumbnailServiceImpl.java

Reverse Merge:

2016-09-19 10:23:19 +00:00

UpdateThumbnailActionExecuter.java

…