You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2016/01/25 18:14:31 UTC
ambari git commit: Revert "AMBARI-14745. Ambari server throws error
when unused configs are present in blueprint (Oliver Szabo via rlevas)"
Repository: ambari
Updated Branches:
refs/heads/trunk b711de824 -> f680b52f9
Revert "AMBARI-14745. Ambari server throws error when unused configs are present in blueprint (Oliver Szabo via rlevas)"
This reverts commit 150eb0e92c89efe8e2e36c88e083e6f962b9e121.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f680b52f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f680b52f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f680b52f
Branch: refs/heads/trunk
Commit: f680b52f9057cea3b06e315e97dc6e3226c53c94
Parents: b711de8
Author: Robert Levas <rl...@hortonworks.com>
Authored: Mon Jan 25 12:14:24 2016 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jan 25 12:14:24 2016 -0500
----------------------------------------------------------------------
.../apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f680b52f/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
index 21492cf..3d2685e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/ldap/AmbariLdapDataPopulator.java
@@ -556,7 +556,6 @@ public class AmbariLdapDataPopulator {
final LdapTemplate ldapTemplate = loadLdapTemplate();
PagedResultsDirContextProcessor processor = createPagingProcessor();
SearchControls searchControls = new SearchControls();
- searchControls.setReturningObjFlag(true);
searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE);
LdapUserContextMapper ldapUserContextMapper = new LdapUserContextMapper(ldapServerProperties);
String encodedFilter = filter.encode();