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
This commit is contained in:
Alan Davis
2013-09-06 07:19:22 +00:00
parent 2f707cd8de
commit f2d52228ec

View File

@@ -2375,8 +2375,7 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean imp
}
// Create a ClusterConfigSection and attach it to 'this'.
ClusterConfigSection clusterConf = new ClusterConfigSection(this);
clusterConf.setConfigFile(clusterConfigBean.getConfigFile());
ClusterConfigSection clusterConf = new ClusterConfigSection(this);
}