Branch: refs/heads/master Home: https://github.com/rhq-project/rhq Commit: 2934189f9cb28e5d13227c30c9b17d55975f5868 https://github.com/rhq-project/rhq/commit/2934189f9cb28e5d13227c30c9b17d5597... Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: 2014-10-08 (Wed, 08 Oct 2014)

Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/LdapGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/LdapGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerLocal.java

Log Message: ----------- [BZ 962886] throw console errors when LDAP server is enabled, but not reachable.

Conflicts:

modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties