Commit Graph

10 Commits

Author SHA1 Message Date
Ancuta Morarasu
f74239ffff Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
123477 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      123368 gjames: MNT-15114: Test to ensure the policy fires


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-15 14:57:39 +00:00
Alan Davis
ac86882aee Reverse merged 5.1.N (5.1.1) to get a green build
123552: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123511 mward: MNT-15815: fix failing test due to prefix clash,
         123550: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123490 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123221 mward: ACE-5120: further fixes (ADMLuceneTest),
         123549: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123489 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123148 mward: ACE-5120: change NS prefix in test to avoid clash,
         123548: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123488 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123145 mward: ACE-5120: fix ADMLuceneCategoryTest,
         123547: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123487 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123142 mward: ACE-5120: further test fixes,
         123546: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123486 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123028 mward: ACE-5120: test fixes,
         123545: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123483 mward: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123000 mward: ACE-5120: Dictionary should not allow duplication of namespace prefixes,
         123543: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
            123477 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               123368 gjames: MNT-15114: Test to ensure the policy fires


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-12 10:16:48 +00:00
Andrei Rebegea
7214438240 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
123477 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
            123368 gjames: MNT-15114: Test to ensure the policy fires


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 15:31:55 +00:00
Ancuta Morarasu
998ebb98de Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113684 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
      113603 cturlica: Merged DEV to V4.2-BUG-FIX (4.2.6)
         113602 cturlica: MNT-14504: Cloud pull process not working after large delete


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@113727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-06 08:58:59 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
5c2620ad78 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93245: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93127: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93074: Add negative test when attempting to add a 'residual' aspect (aspect not in the dictionary)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:14:05 +00:00
Alan Davis
4119889331 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59855: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59601: Merged DEV to V4.2-BUG-FIX
         58003: Prevent QNameDAO from being used without a txn (MNT-9806)
         58022: Fix bootstrap sequencing issues related to Content Publishing and Site models
                - I thought I had broken something but it's one of those random bean loading issues that we don't commonly see
                - Pulled models into core model lists so that we know and understand the ordering of the model loading
                - Removed QNameDAO transaction check, just in case (will reapply it with subsequent commit)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 08:07:52 +00:00
Alan Davis
cd02df033a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58885: Tweaking the tests and handling null better


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62054 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:27:25 +00:00
Alan Davis
1a05b428a3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57053: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56520: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         56403: Various format fixes made during investigations e.g. ALF-20221


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:01:50 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00