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
This commit is contained in:
Mark Rogers
2014-09-20 08:56:19 +00:00
parent 0dac120b1c
commit b757f92bf6
2 changed files with 2 additions and 2 deletions

View File

@@ -88,7 +88,7 @@ cache.contentUrlSharedCache.eviction-policy=LRU
cache.contentUrlSharedCache.eviction-percentage=25 cache.contentUrlSharedCache.eviction-percentage=25
cache.contentUrlSharedCache.merge-policy=hz.ADD_NEW_ENTRY cache.contentUrlSharedCache.merge-policy=hz.ADD_NEW_ENTRY
cache.contentUrlMasterKeySharedCache.tx.maxItems=65000 cache.contentUrlMasterKeySharedCache.tx.maxItems=50
cache.contentUrlMasterKeySharedCache.maxItems=0 cache.contentUrlMasterKeySharedCache.maxItems=0
cache.contentUrlMasterKeySharedCache.timeToLiveSeconds=0 cache.contentUrlMasterKeySharedCache.timeToLiveSeconds=0
cache.contentUrlMasterKeySharedCache.maxIdleSeconds=0 cache.contentUrlMasterKeySharedCache.maxIdleSeconds=0

View File

@@ -84,7 +84,7 @@
<value>org.alfresco.cache.contentUrlMasterKeyTransactionalCache</value> <value>org.alfresco.cache.contentUrlMasterKeyTransactionalCache</value>
</property> </property>
<property name="maxCacheSize" value="${cache.contentUrlMasterKeySharedCache.tx.maxItems}" /> <property name="maxCacheSize" value="${cache.contentUrlMasterKeySharedCache.tx.maxItems}" />
<property name="mutable" value="true" /> <property name="mutable" value="false" />
<property name="allowEqualsChecks" value="false" /> <property name="allowEqualsChecks" value="false" />
<property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" /> <property name="disableSharedCache" value="${system.cache.disableMutableSharedCaches}" />
</bean> </bean>