Return-Path: 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 631A2200CC5 for ; Mon, 26 Jun 2017 19:27:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 61ACD160C05; Mon, 26 Jun 2017 17:27:25 +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 D054D160BFE for ; Mon, 26 Jun 2017 19:27:24 +0200 (CEST) Received: (qmail 47023 invoked by uid 500); 26 Jun 2017 17:27:24 -0000 Mailing-List: contact commits-help@metron.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@metron.apache.org Delivered-To: mailing list commits@metron.apache.org Received: (qmail 46938 invoked by uid 99); 26 Jun 2017 17:27:23 -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, 26 Jun 2017 17:27:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2F265E97E0; Mon, 26 Jun 2017 17:27:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mattf@apache.org To: commits@metron.apache.org Date: Mon, 26 Jun 2017 17:27:27 -0000 Message-Id: <21aecb9eb4f048d18bece3a0d3333b98@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/18] metron git commit: METRON-979 markdown errors in site-book, Part 3 (mattf-horton) closes apache/metron#611 archived-at: Mon, 26 Jun 2017 17:27:25 -0000 METRON-979 markdown errors in site-book, Part 3 (mattf-horton) closes apache/metron#611 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/605a3cc6 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/605a3cc6 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/605a3cc6 Branch: refs/heads/Metron_0.4.0 Commit: 605a3cc6d29d0ac1377270b1455819645f4a95bc Parents: d0e1ba5 Author: mattf-horton Authored: Tue Jun 6 21:18:55 2017 -0700 Committer: mattf Committed: Tue Jun 6 21:18:55 2017 -0700 ---------------------------------------------------------------------- metron-deployment/Kerberos-manual-setup.md | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/605a3cc6/metron-deployment/Kerberos-manual-setup.md ---------------------------------------------------------------------- diff --git a/metron-deployment/Kerberos-manual-setup.md b/metron-deployment/Kerberos-manual-setup.md index cdfbdfb..4efebc6 100644 --- a/metron-deployment/Kerberos-manual-setup.md +++ b/metron-deployment/Kerberos-manual-setup.md @@ -381,11 +381,7 @@ Push Data ``` cat sample-bro.txt | ${KAFKA_HOME}/kafka-broker/bin/kafka-console-producer.sh \ -<<<<<<< HEAD --broker-list ${BROKERLIST} \ -======= - --broker-list ${BROKERLIST} ->>>>>>> d550b9eff34d931aeae7151713c0e07f28719d4c --security-protocol SASL_PLAINTEXT \ --topic bro ```