From ef77e4af2f84ed2acacd3434112ac6c216e646f2 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 22 Jan 2016 16:24:13 +0000 Subject: [PATCH] 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 --- .../bitrock/alfresco/shared/alfresco-global.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties index 1b694ba6c6..4fc24e453c 100644 --- a/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties +++ b/src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties @@ -63,8 +63,8 @@ solr.port.ssl=@@BITROCK_SOLR_SSL_PORT@@ ### Allow extended ResultSet processing security.anyDenyDenies=false -### Virtual Folders Config Properties ### -virtual.folders.enabled=false +### Smart Folders Config Properties ### +smart.folders.enabled=false ### Remote JMX (Default: disabled) ### alfresco.jmx.connector.enabled=false \ No newline at end of file