Repository: metron Updated Branches: refs/heads/master d0e1ba508 -> 605a3cc6d
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/master Commit: 605a3cc6d29d0ac1377270b1455819645f4a95bc Parents: d0e1ba5 Author: mattf-horton <[email protected]> Authored: Tue Jun 6 21:18:55 2017 -0700 Committer: mattf <[email protected]> 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 ```
