Branch: refs/heads/release/jon3.2.x
Home:
https://github.com/rhq-project/rhq
Commit: 4f23c5dc8cc7831eb01d53138fde1b831e4cc496
https://github.com/rhq-project/rhq/commit/4f23c5dc8cc7831eb01d53138fde1b8...
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java
M
modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.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/core/CustomJaasDeploymentService.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java
M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java
Log Message:
-----------
[BZ 1082806] - Context referrals are hardcoded to ignore in LDAP configuration - making
'follow referrals' optionally configurable in system settings
* reverting the db schema part of the the commit 4ddea9bb2d940408 because we don't
allow for schema updates in cumulative patches
Signed-off-by: Lukas Krejci <lkrejci(a)redhat.com>
Conflicts:
modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
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
(cherry picked from commit 828815e564c1d1d56fd2674518699505c79acff5)
Signed-off-by: Lukas Krejci <lkrejci(a)redhat.com>