Alan Davis f2d52228ec Merged HEAD-BUG-FIX to HEAD (4.2) ...

54964: Reverse merged as it cause a compilation error. Config structures have chnaged between 4.1 and 4.2 
      54931: MNT-9576: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
         54563: MNT-9461 - CIFS Clustering not Working in alfresco 4.1.5


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2013-09-06 07:19:22 +00:00

..

acl

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

CIFSConfigBean.java

Merged V4.0-BUG-FIX to HEAD

2012-03-02 15:00:35 +00:00

ClusterConfigBean.java

Merged BRANCHES/DEV/mward/clustering_p1 to HEAD:

2012-10-01 12:17:53 +00:00

CoreServerConfigBean.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

DomainMappingConfigBean.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

FileServerConfigurationFactory.java

Merged BRANCHES/DEV/mward/clustering_p1 to HEAD:

2012-10-01 12:17:53 +00:00

FTPConfigBean.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

GlobalDesktopActionConfigBean.java

Merged DEV/BELARUS/HEAD-2010_02_10 to HEAD

2010-03-12 18:41:09 +00:00

MemoryPacketConfigBean.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

NetBIOSSMBConfigBean.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

NFSConfigBean.java

Added RPCRegisterPort configuration value, and nfs.rpcRegisterPort property.

2010-03-18 16:31:57 +00:00

package-info.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

SecurityConfigBean.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

ServerConfigurationBean.java

Merged HEAD-BUG-FIX to HEAD (4.2)

2013-09-06 07:19:22 +00:00

TcpipSMBConfigBean.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

Win32NetBIOSConfigBean.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

WINSConfigBean.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00