Mark Rogers 6d398a5ba9 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) ...

84733: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78807: ACE-2083	 - Only allow document encryption if the capability has been licensed


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

2014-09-19 22:19:44 +00:00

..

subsystems

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

2014-09-19 22:19:44 +00:00

DummyManagedResource.java

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

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

DynamicMBeanExporter.java

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

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

DynamicMBeanExportOperations.java

Merged V4.0-BUG-FIX to HEAD

2012-03-06 19:50:32 +00:00

JmxDumpUtil.java

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

2014-02-11 22:27:32 +00:00

ManagedBean.java

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

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

SafeApplicationEventMulticaster.java

Merged V4.0-BUG-FIX to HEAD

2012-02-08 11:06:09 +00:00