From b757f92bf641d5ec38e77488da275b66edba3fd7 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Sat, 20 Sep 2014 08:56:19 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 84890: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 83361: MNT-12142 "CryptoDoc: Cluster: JMX actions don't work from the second cluster node" git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85210 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/caches.properties | 2 +- config/alfresco/tx-cache-context.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/alfresco/caches.properties b/config/alfresco/caches.properties index e6f7f3777f..8ab1b1e0d0 100644 --- a/config/alfresco/caches.properties +++ b/config/alfresco/caches.properties @@ -88,7 +88,7 @@ cache.contentUrlSharedCache.eviction-policy=LRU cache.contentUrlSharedCache.eviction-percentage=25 cache.contentUrlSharedCache.merge-policy=hz.ADD_NEW_ENTRY -cache.contentUrlMasterKeySharedCache.tx.maxItems=65000 +cache.contentUrlMasterKeySharedCache.tx.maxItems=50 cache.contentUrlMasterKeySharedCache.maxItems=0 cache.contentUrlMasterKeySharedCache.timeToLiveSeconds=0 cache.contentUrlMasterKeySharedCache.maxIdleSeconds=0 diff --git a/config/alfresco/tx-cache-context.xml b/config/alfresco/tx-cache-context.xml index 0f6f81038c..67aab6d0ac 100644 --- a/config/alfresco/tx-cache-context.xml +++ b/config/alfresco/tx-cache-context.xml @@ -84,7 +84,7 @@ org.alfresco.cache.contentUrlMasterKeyTransactionalCache - +