ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject 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 17:15:32 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 da8afc426 -> 93a76c445


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/93a76c44
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93a76c44
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93a76c44

Branch: refs/heads/branch-2.2
Commit: 93a76c4459a728a0048ede754ffe0cc7c10b7b91
Parents: da8afc4
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 12:12:59 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/93a76c44/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