inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
124281 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124275 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         124171 jphuynh: MNT-15874: Fix missing Remote Solr configuration properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:03:12 +00:00
parent 7f6d895a04
commit ac61b30062
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties
View File

@@ -63,7 +63,8 @@ dir.license.external=@@BITROCK_ALFRESCO_LICENSE_DIR@@
### Solr indexing ###
index.subsystem.name=solr4
dir.keystore=${dir.root}/keystore
solr.port.ssl=@@BITROCK_TOMCAT_SSL_PORT@@
solr.host=localhost
solr.port.ssl=@@BITROCK_SOLR_SSL_PORT@@
### Smart Folders Config Properties ###
smart.folders.enabled=false