Return-Path: <commits-return-50109-archive-asf-public=cust-asf.ponee.io@ambari.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 4A539200D61
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  5 Dec 2017 00:23:39 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 49003160C1C; Mon,  4 Dec 2017 23:23:39 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 8F965160BF9
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  5 Dec 2017 00:23:38 +0100 (CET)
Received: (qmail 482 invoked by uid 500); 4 Dec 2017 23:23:37 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 471 invoked by uid 99); 4 Dec 2017 23:23:37 -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, 04 Dec 2017 23:23:37 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 9B64BDFBEE; Mon,  4 Dec 2017 23:23:37 +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, 04 Dec 2017 23:23:37 -0000
Message-Id: <708ac6c1b5e043388d46911d85584688@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [01/13] ambari git commit: AMBARI-22485 : Allow Ambari to support
 non-kerberos SASL mechanisms for Kafka - Addendum,
 fix incorrect config tag (ydavis via mradhakrishnan)
archived-at: Mon, 04 Dec 2017 23:23:39 -0000

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-20859 b6cf4325e -> de4deaf0b


AMBARI-22485 : Allow Ambari to support non-kerberos SASL mechanisms for Kafka - Addendum, fix incorrect config tag (ydavis via mradhakrishnan)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 47be7edce686354c11b38d32f6bff3b4318bc611
Parents: 959ad90
Author: Madhuvanthi Radhakrishnan <mradhakrishnan@hortonworks.com>
Authored: Fri Dec 1 13:44:12 2017 -0800
Committer: Madhuvanthi Radhakrishnan <mradhakrishnan@hortonworks.com>
Committed: Fri Dec 1 13:45:46 2017 -0800

----------------------------------------------------------------------
 .../common-services/KAFKA/0.10.0/configuration/kafka-broker.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/47be7edc/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/configuration/kafka-broker.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/configuration/kafka-broker.xml
index da382d5..53c2ca3 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/configuration/kafka-broker.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0/configuration/kafka-broker.xml
@@ -22,7 +22,7 @@
         <name>sasl.enabled.mechanisms</name>
         <value>GSSAPI</value>
         <description>The list of SASL mechanisms enabled in the Kafka server. The list may contain any mechanism for which a security provider is available. Only GSSAPI is enabled by default.</description>
-        <on-ambari-upgrade add="upgrade"/>
+        <on-ambari-upgrade add="true"/>
     </property>
     <property>
         <name>security.inter.broker.protocol</name>