Alan Davis 9aea46c7ae Merged 5.1.N (5.1.1) to HEAD (5.2) ...

122983 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122910 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122808 adavis: MNT-15738 Property to disable transformers by use (e.g. doclib thumbnail generation) in 4.2 is not working
            - Allow 'use' style properties to be set
            - Combine 'use' properties more flexibly with the default ones.


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

2016-03-11 22:32:22 +00:00

..

caching

CachingContentStore handles "spoof://" content URLs (ACE-4516:DataLoad file spoofing fails with S3 connector)

2015-10-27 18:28:04 +00:00

cleanup

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

filestore

Reverse merged HEAD (5.1)

2016-03-01 10:36:14 +00:00

http

…

metadata

Merged 5.1.N (5.1.1) to HEAD (5.2)

2016-03-11 22:31:52 +00:00

replication

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

selector

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

transform

Merged 5.1.N (5.1.1) to HEAD (5.2)

2016-03-11 22:32:22 +00:00

AbstractContentAccessor.java

Merged V3.4-BUG-FIX to HEAD

2011-05-21 10:41:57 +00:00

AbstractContentReader.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-16 13:36:33 +00:00

AbstractContentStore.java

Merge Sabre4 to HEAD

2015-09-01 13:05:22 +00:00

AbstractContentStreamListener.java

…

AbstractContentWriter.java

Merged 5.1.N (5.1.1) to HEAD (5.1)

2016-03-11 21:43:05 +00:00

AbstractRoutingContentStore.java

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-07-23 15:57:20 +00:00

AbstractStreamAwareProxy.java

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-09-18 17:23:49 +00:00

ContentExistsException.java

…

ContentLimitProvider.java

Merged V4.1-BUG-FIX to HEAD

2012-08-10 07:55:53 +00:00

ContentLimitViolationException.java

Merged V4.1-BUG-FIX to HEAD

2012-08-10 07:55:53 +00:00

ContentServiceImpl.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ContentServicePolicies.java

Merge Sabre4 to HEAD

2015-09-01 13:05:22 +00:00

ContentStoreCreatedEvent.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

ContentWorker.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-03-27 23:00:01 +00:00

EmptyContentReader.java

Merged V4.1-BUG-FIX to HEAD

2013-02-27 11:56:13 +00:00

LimitedStreamCopier.java

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-04-02 22:01:30 +00:00

NodeContentContext.java

…

RoutingContentService.java

…

StreamAwareContentReaderProxy.java

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-09-18 17:23:49 +00:00

StreamAwareContentWriterProxy.java

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

2014-09-18 17:23:49 +00:00

TikaOfficeDetectParser.java

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

2015-07-02 16:13:03 +00:00

UnsupportedContentUrlException.java

…