Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 01C3A18624 for ; Mon, 25 Jan 2016 19:53:21 +0000 (UTC) Received: (qmail 31914 invoked by uid 500); 25 Jan 2016 19:53:20 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 31859 invoked by uid 500); 25 Jan 2016 19:53:20 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 31749 invoked by uid 99); 25 Jan 2016 19:53:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jan 2016 19:53:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B150EE0211; Mon, 25 Jan 2016 19:53:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rlevas@apache.org To: commits@ambari.apache.org Date: Mon, 25 Jan 2016 19:53:22 -0000 Message-Id: <5b46e364e5e44723b064df61289149c8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] ambari git commit: Revert "AMBARI-14745. Ambari server throws error when unused configs are present in blueprint (Oliver Szabo via rlevas)" 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 Authored: Mon Jan 25 12:12:59 2016 -0500 Committer: Robert Levas 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();