4 Commits

Author SHA1 Message Date
Mark Rogers
afe200fbd5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84811: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      82464: ACE-1246 "Allow the customer to change the document encryption key"
      Encrypting content store


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 08:36:54 +00:00
Mark Rogers
3349e56606 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77152: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73997: Test cleanup following r73957: ContentStore API cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 16:03:00 +00:00
Mark Rogers
f1310c6c8d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77148: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73957: ContentStore API cleanup
       - Removed previously-deprecated ContentStore.getWriter(ContentReader existingContentReader, String newContentUrl)
       - Removed previously-deprecated getSpaceUsed()
       - Removed previously-deprecated getTotalSize()
       - Deprecated optional and unused getUrls() and variants
       - Clean up of implementations to ignore relevant deprecations, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:57:20 +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