Alan Davis b1577072fc Merged 5.1-MNT1 (5.1.0) to HEAD (5.1) ...

115466 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114587 amorarasu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114483 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114306 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114282 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  114252: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - configured cmis tck timeout in tests property file


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

2015-10-30 00:11:44 +00:00

..

alfresco

Merge Sabre4 to HEAD

2015-09-01 13:04:56 +00:00

custommodel

Merged DEV to HEAD

2015-08-04 01:56:12 +00:00

models

Merged 5.0.N (5.0.3) to HEAD (5.1)

2015-08-04 09:58:21 +00:00

org/alfresco/repo

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

2015-01-31 11:02:23 +00:00

publicapi

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

2014-09-03 12:15:25 +00:00

workflow

Merged 5.0.N (5.0.3) to HEAD (5.1)

2015-08-04 09:58:21 +00:00

alfresco-global.properties

Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

2015-10-30 00:11:44 +00:00

davLockInfoAdmin.xml

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

2014-09-18 17:17:50 +00:00

davLockInfoUser2.xml

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

2014-09-18 17:17:50 +00:00

filewithdata.txt

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

2014-02-12 09:51:38 +00:00

log4j.properties

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

2014-05-16 17:43:48 +00:00

rest-api-test-context.xml

Merged 5.0.N (5.0.3) to HEAD (5.1)

2015-08-04 09:58:21 +00:00

test-rest-context.xml

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

test.jpg

Removed svn:executable tag

2010-03-09 00:39:21 +00:00