Merged HEAD (5.1) to 5.1.N (5.1.1)

121253 sdinuta: CM-709: Virtual to Smart: merge VF branches (core/share) into HEAD,trunk


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-01-22 16:24:13 +00:00
parent b2b3b2014c
commit ef77e4af2f

View File

@@ -63,8 +63,8 @@ solr.port.ssl=@@BITROCK_SOLR_SSL_PORT@@
### Allow extended ResultSet processing ### Allow extended ResultSet processing
security.anyDenyDenies=false security.anyDenyDenies=false
### Virtual Folders Config Properties ### ### Smart Folders Config Properties ###
virtual.folders.enabled=false smart.folders.enabled=false
### Remote JMX (Default: disabled) ### ### Remote JMX (Default: disabled) ###
alfresco.jmx.connector.enabled=false alfresco.jmx.connector.enabled=false