ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject [3/6] ambari git commit: Revert "AMBARI-14745. Ambari server throws error when unused configs are present in blueprint (Oliver Szabo via rlevas)"
Date Mon, 25 Jan 2016 19:53:22 GMT
Revert "AMBARI-14745. Ambari server throws error when unused configs are present in blueprint
(Oliver Szabo via rlevas)"

This reverts commit da8afc426f8d0b59906e70f78d62626d84b1bc50.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2fbfc3c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2fbfc3c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2fbfc3c3

Branch: refs/heads/branch-2.2.1
Commit: 2fbfc3c3971881dd0b926bcb76523961e6f0b431
Parents: d37aab7
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Mon Jan 25 12:12:59 2016 -0500
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Mon Jan 25 14:51:56 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/2fbfc3c3/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();


Mime
View raw message