inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
44c236573efb7a1e3ea22b02d6ca03dc9e736fc8
alfresco-community-repo/source/test-java
History
Alan Davis 44c236573e Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again) 
AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
   59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
      59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
         58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
            58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
            58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Return beforePurgeNode callback binding to Site class.
         58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
            58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
         58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
            58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
   59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
      59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
         - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
           was being used in later versions.
   59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
      - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-22 08:16:06 +00:00
..
org/alfresco
Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
2013-12-22 08:16:06 +00:00