15590: Merged V3.1 to V3.2 (JGroups)
15110: Upgraded JGroups (potential fix for ETHREEOH-1497: JGroups UDP stack is not working)
15141: Close existing Channel before starting a new one
15142: Reduced pings' num_initial_members to 2
15143: More succint logging to make DEBUG more useful
15144: Fixed JGroups jar path in classpath
15150: Fixed SDK classpath
15174: JGroups default configuration changes: FD_SIMPLE
15205: Minor JGroups-EHCache tweaks (Real dummy channel, etc)
15592: Merged V3.1 to V3.2
15591: Use Channel.connect without state transfer
15747: (record only) Added beta warning in footer
15786: (record ony) Merge 3.1 to 3.2:
15861: Merged V3.1 to V3.2
15858: (record-only) Fix for ETHREEOH-2698: CLONE -Enterprise 3.x / Searching with Speech Marks ("") for a User ID causes an Error
15881: (record only) ALFCOM-3300: Document move when already exists makes alfresco enter an infinite loop
15889: Cleanup of old static declarations
15890: (record only) Undid accidental offshort commit
15951: (record only) Removed mobile.war from war bundles. Added oracle & mssql config.
15968: (record only) Updated readme
16241: (record only) Fix typos in installer
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged /alfresco/BRANCHES/V3.2:r15888
Merged /alfresco/BRANCHES/V3.1:r15110,15141-15144,15150,15174,15205,15591,15779,15858
Merged /alfresco/BRANCHES/V3.2:r15590,15592,15747,15780,15786,15861,15881,15889-15890,15951,15968,16241
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Merged DEV/LIVECYCLE-3.1 to V3.1
12581: Merged V2.1-A to DEV/LIVECYCLE-3.1
8675: Set FileServers configuration properties using system properties
12603: Merged V2.1-A to DEV/LIVECYCLE-3.1
8702: Added bindto as a property-enabled value
8703: Added bindto as a property-enabled value
8705: Filter out a bind to address of '0.0.0.0'
12631: Merged V2.1-A to DEV/LIVECYCLE-3.1
8551: JGroups Channel factory
12633: Merged V2.1-A to DEV\LIVECYCLE-3.1
8552: Wired in JGroups heartbeats
8554: Re-delete file
8573: Failed hearbeat still must still wait before trying again
8582: JGroups EHCache heartbeat fixes for TCP stack
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r8551-8552,8554,8573,8582,8675,8702-8705
Merged /alfresco/BRANCHES/V3.1:r12893
Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12581,12603,12631,12633
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
