Merge branch '4.5'

This commit is contained in:
Rajani Karuturi 2014-11-06 09:46:30 +05:30
commit 6766b6c6e4

View File

@ -30,7 +30,6 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.LDAPConfigResponse; import org.apache.cloudstack.api.response.LDAPConfigResponse;
import org.apache.cloudstack.api.response.LdapConfigurationResponse;
import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.config.impl.ConfigurationVO; import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
@ -227,7 +226,7 @@ public class LDAPConfigCmd extends BaseCmd {
} }
private boolean updateLDAP() { private boolean updateLDAP() {
LdapConfigurationResponse response = _ldapManager.addConfiguration(hostname, port); _ldapManager.addConfiguration(hostname, port);
/** /**
* There is no query filter now. It is derived from ldap.user.object and ldap.search.group.principle * There is no query filter now. It is derived from ldap.user.object and ldap.search.group.principle