Commit Graph

6477 Commits

Author SHA1 Message Date
Andrei Rebegea
f7ac2331dd Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118657 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
      118656 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
         118655 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
            118542 amorarasu: Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)
               117462 118473 amorarasu: MNT-15147: Cloud 40 Upgrade takes too long
                  - Make the patch.fixPersonSizeCurrentType to not apply to tenants
                  - Added support for making patch.addUnmovableAspect deferred


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 09:17:00 +00:00
Andrei Rebegea
c6ad312dea Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118652 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118603 amukha: Merged V4.2.3 (4.2.3.21) to V4.2-BUG-FIX (4.2.6)
         117952 adragoi: MNT-15169 : Receiving error when bulk deleting content in Share
            - moved deletion in a retrying context 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 09:12:13 +00:00
Mihai Cozma
acb6e2db75 ACE-4726 Max number of open files reached when browsing virtual folders (Linux OS)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 08:45:19 +00:00
Andrei Rebegea
ac776d8476 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118435 cturlica: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118397 cturlica: MNT-15229: Add check of vulnerable classes to bootstrap
         -  changes on bootstrap bean validator and bootstrap-context.xml 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-25 11:38:03 +00:00
Jan Vonka
b6bf8f5e1c ACE-4734 - minor: add optional info/debug logging for CMIS calls (to get/list object/objects)
- relates to ACE-198 & ACE-202

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-24 16:35:52 +00:00
Gavin Cornwell
620e4d37d5 ACE-4598: ServiceRegistry exposes services that are not part of the public API
Updated the deprecated message wording to make it clearer it's just the method on ServiceRegistry that's deprecated and not the service/object being returned.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118420 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-24 12:01:01 +00:00
Natalia Smintanca
efb26c99dc Merged HEAD (5.1) to 5.1.N (5.1.1)
118256 sdinuta: ACE-4699: Document preview is changed to the physical location after "Edit Offline \ Cancel Editing" action


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118350 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 11:31:38 +00:00
Natalia Smintanca
4720b731fe Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118271 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
      118270 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
         118269 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
            118268 adavis:       Reverse merged 5.0.2-PLUS (5.0.2-PLUS)
                  << Caused lots of failures with the real fix rather than the patched one in 39.6.6 >>
                     118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
                        116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
                           - added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118314 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 11:01:03 +00:00
Natalia Smintanca
0c55fc5905 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118237 aleahu: MNT-14853 : Unable to download zip with non primary child
      - Fixed spacing by removing tabs as per Derek's request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:57:08 +00:00
Natalia Smintanca
e00500f6f0 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118231 aleahu: MNT-14853 : Unable to download zip with non primary child
      - Added the flag exportSecondaryNodes for the ExporterComponent, and if this is set on true we export the secondary nodes as actual nodes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:56:56 +00:00
Natalia Smintanca
f274fc9ce7 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118229 aleahu: MNT-14730 : Approve and Reject workflow not working in subfolders after the rule has been applied
      - Renamed the copied file when executing a simple workflow rule in order to avoid name conflicts by using copyAndRename instead of copy.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:56:43 +00:00
Natalia Smintanca
5d5fc30a91 Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118217 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
      118216 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to V4.2-BUG-FIX (4.2.6)
         118215 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            118214 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
               118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
                  116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
                     - added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-23 10:56:29 +00:00
Silviu Dinuta
2ecad935cf ACE-4699: Document preview is changed to the physical location after "Edit Offline \ Cancel Editing" action
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118256 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-20 17:46:04 +00:00
Natalia Smintanca
76b0d1dffb Merged HEAD (5.1) to 5.1.N (5.1.1)
117981 amukha: Merged DEV (5.1) to HEAD (5.1)
      117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
      117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
         - Updated the BehaviourFilter interface accordingly.,
      115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
         - Modified the isEnabled(QName className) to correspond with the new logic
         - Modified the JUnit tests.,
      115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
      115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
         - Added new API for disabling behaviours.
         - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-19 09:48:28 +00:00
Natalia Smintanca
a5b9ac9bef Merged HEAD (5.1) to 5.1.N (5.1.1)
117847 ahind: Fix for     ACE-4575 SOLR 4 - Sharded - Backup should fail gracefully


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-19 09:41:25 +00:00
Natalia Smintanca
548b90a94b Merged HEAD (5.1) to 5.1.N (5.1.1)
117598 bhorje: CM-690 reverted AMD DAO trait extension 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-19 09:25:58 +00:00
Alex Mukha
c0c2a9c1d1 Merged DEV (5.1) to HEAD (5.1)
117318: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
   117293: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Changed the ClassBehaviourIndex#find as the main logic is handled by BehaviourFilterImpl#isEnabled
      - Updated the BehaviourFilter interface accordingly.,
   115822: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Reworked the solution to use only one new method: disable(QName className, boolean includeSubClasses)
      - Modified the isEnabled(QName className) to correspond with the new logic
      - Modified the JUnit tests.,
   115078: ACE-4421: Minor tweak (JavaDoc comment + fix boolean),
   115071: ACE-4421: Custom behaviours cannot be disabled (using disableBehaviour(QName))
      - Added new API for disabling behaviours.
      - Added JUnit tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-18 17:13:08 +00:00
Ramona Neamtu
d0d33807ca Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
117707 aleahu: MNT-14341 : FTP authentication fails when External authentication is enabled
      - Checked that the instance of the authenticator used is not the same as the one from which the call is made


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-18 14:18:19 +00:00
Andrew Hind
3d4f9a07c0 Fix for ACE-4575 SOLR 4 - Sharded - Backup should fail gracefully
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-18 10:54:15 +00:00
Bogdan Horje
cb38dc5f7b CM-690 reverted AMD DAO trait extension
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-16 07:14:29 +00:00
Alan Davis
cd43fe582c Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
117582 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
      116652 amorarasu: MNT-14983: CMIS: Euro character not encoded correctly
         Merged V4.2.4 (4.2.4.19) to V4.2-BUG-FIX (4.2.6)
            115140 115998 116396 amorarasu: MNT-15044: CLONE - CMIS: Euro character not encoded correctly
               - Removed the unicode interval that was used to escape characters from the categories: currency, general punctuation, subscripts and superscripts (2000-20FF).
               - Changed the way the control characters are filtered + adapted tests.
               - Removed unnecessary j_string use from the ftl and added proper xml encoding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-15 21:30:05 +00:00
Alan Davis
9104f61c74 Merged HEAD (5.1) to 5.1.N (5.1.1)
117537 bhorje: CM-690 reverted AMD DAO trait extension 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:38:30 +00:00
Alan Davis
9e202dcd66 Merged HEAD (5.1) to 5.1.N (5.1.1)
117531 bhorje: CM-690 virtualization is disabled by default - virtualization integration tests and the integration tests suite  run with vf enabled 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:38:20 +00:00
Alan Davis
1ec4f05efc Merged HEAD (5.1) to 5.1.N (5.1.1)
117489 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:37:20 +00:00
Alan Davis
508e2e52d8 Merged HEAD (5.1) to 5.1.N (5.1.1)
117488 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:53 +00:00
Alan Davis
a64d5324e9 Merged HEAD (5.1) to 5.1.N (5.1.1)
117487 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:46 +00:00
Alan Davis
7ec342be8b Merged HEAD (5.1) to 5.1.N (5.1.1)
117486 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:39 +00:00
Alan Davis
ac94987b61 Merged HEAD (5.1) to 5.1.N (5.1.1)
117485 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:32 +00:00
Alan Davis
ea1b4f89c1 Merged HEAD (5.1) to 5.1.N (5.1.1)
117484 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117568 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:26 +00:00
Alan Davis
be8b2fa355 Merged HEAD (5.1) to 5.1.N (5.1.1)
117483 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:19 +00:00
Alan Davis
cda0437ea3 Merged HEAD (5.1) to 5.1.N (5.1.1)
117482 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:12 +00:00
Alan Davis
3f578fdc6b Merged HEAD (5.1) to 5.1.N (5.1.1)
117481 bhorje: CM-690 extensions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:35:05 +00:00
Alan Davis
9fabc967ee Merged HEAD (5.1) to 5.1.N (5.1.1)
117474 bhorje: CM-690 virtualization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:32:21 +00:00
Alan Davis
98213d66d7 Merged HEAD (5.1) to 5.1.N (5.1.1)
117473 bhorje: CM-690 trait extension


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-14 13:32:09 +00:00
Bogdan Horje
0c5b943360 CM-690 reverted AMD DAO trait extension
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-13 15:12:55 +00:00
Bogdan Horje
92cb3e2972 CM-690 virtualization is disabled by default - virtualization integration tests and the integration tests suite run with vf enabled
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-13 12:47:13 +00:00
Bogdan Horje
005c9543f5 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:32:24 +00:00
Bogdan Horje
37602b45e5 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:31:44 +00:00
Bogdan Horje
22e4acd68e CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117487 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:30:17 +00:00
Bogdan Horje
de57b9220f CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117486 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:27:41 +00:00
Bogdan Horje
19d7327617 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:27:30 +00:00
Bogdan Horje
cf14e353a5 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:26:36 +00:00
Bogdan Horje
efb91d31a0 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:25:49 +00:00
Bogdan Horje
99cd45d810 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:23:33 +00:00
Bogdan Horje
1151a782f4 CM-690 extensions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:19:53 +00:00
Bogdan Horje
4ed133e259 CM-690 virtualization
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 19:08:08 +00:00
Bogdan Horje
c0f5336745 CM-690 trait extension
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@117473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 18:57:10 +00:00
Tatyana Valkevych
c9618fdb69 Merged HEAD (5.1) to 5.1.N (5.1.1)
117316 gcornwell: ACE-4598: ServiceRegistry exposes services that are not part of the public API (i.e. not annotated via @AlfrescoPublicApi)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 10:22:23 +00:00
Tatyana Valkevych
3ca1dfd1ea Merged HEAD (5.1) to 5.1.N (5.1.1)
117315 tpage: ACE-2671 Unit tests for QNameTypeEditor.
   The QNameTypeEditor was migrated from RM to repo in r83388, but
   at the time there were no unit tests. This closes the issue by
   adding unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-12 10:21:30 +00:00
Alan Davis
3e5bf71699 Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117263 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
      114898 gjames: BCRYPT MNT-14892 RA-609, better logging messages and added OnStartup validation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-11 18:03:28 +00:00