You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by bb...@apache.org on 2020/10/08 19:16:03 UTC
[kafka] 25/31: Merge branch 'master' of
https://github.com/confluentinc/kafka into trunk
This is an automated email from the ASF dual-hosted git repository.
bbejeck pushed a commit to branch Merge_AK_to_CCS_10_08_2020
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit f664ff56bebad3c22d5264cc0542405cbeb192f0
Merge: e034fed 43287fd
Author: Confluent Jenkins Bot <je...@confluent.io>
AuthorDate: Mon Aug 17 11:57:02 2020 +0000
Merge branch 'master' of https://github.com/confluentinc/kafka into trunk
Confluent-README.md | 6 +
Jenkinsfile | 137 +++++++++++++++++++++
gradle.properties => Makefile | 21 ++--
gradle.properties => bin/connect-distributed | 13 +-
bin/connect-distributed.sh | 31 ++++-
gradle.properties => bin/connect-standalone | 13 +-
bin/connect-standalone.sh | 31 ++++-
bin/{kafka-server-stop.sh => git-hooks/pre-push} | 37 +++---
gradle.properties => bin/kafka-acls | 13 +-
gradle.properties => bin/kafka-broker-api-versions | 13 +-
gradle.properties => bin/kafka-configs | 13 +-
gradle.properties => bin/kafka-console-consumer | 13 +-
gradle.properties => bin/kafka-console-producer | 13 +-
gradle.properties => bin/kafka-consumer-groups | 13 +-
gradle.properties => bin/kafka-consumer-perf-test | 13 +-
gradle.properties => bin/kafka-delegation-tokens | 13 +-
gradle.properties => bin/kafka-delete-records | 13 +-
gradle.properties => bin/kafka-dump-log | 13 +-
gradle.properties => bin/kafka-log-dirs | 13 +-
gradle.properties => bin/kafka-mirror-maker | 13 +-
.../kafka-preferred-replica-election | 13 +-
gradle.properties => bin/kafka-producer-perf-test | 13 +-
gradle.properties => bin/kafka-reassign-partitions | 13 +-
.../kafka-replica-verification | 13 +-
gradle.properties => bin/kafka-run-class | 13 +-
bin/kafka-run-class.sh | 17 ++-
gradle.properties => bin/kafka-server-start | 13 +-
bin/kafka-server-start.sh | 11 +-
gradle.properties => bin/kafka-server-stop | 13 +-
bin/kafka-server-stop.sh | 10 +-
.../kafka-streams-application-reset | 13 +-
gradle.properties => bin/kafka-topics | 13 +-
gradle.properties => bin/kafka-verifiable-consumer | 13 +-
gradle.properties => bin/kafka-verifiable-producer | 13 +-
bin/windows/kafka-run-class.bat | 6 +-
bin/windows/kafka-server-start.bat | 6 +-
bin/windows/zookeeper-server-start.bat | 6 +-
.../zookeeper-security-migration | 13 +-
gradle.properties => bin/zookeeper-server-start | 13 +-
bin/zookeeper-server-start.sh | 11 +-
gradle.properties => bin/zookeeper-server-stop | 13 +-
gradle.properties => bin/zookeeper-shell | 13 +-
build.gradle | 32 ++++-
checkstyle/checkstyle.xml | 6 -
ci.py | 105 ++++++++++++++++
config/connect-distributed.properties | 2 +-
config/connect-standalone.properties | 2 +-
config/server.properties | 12 ++
.../confluent/support/metrics/SupportedKafka.scala | 28 +++++
gradle.properties | 2 +-
gradle/dependencies.gradle | 6 +-
streams/quickstart/java/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
streams/quickstart/pom.xml | 2 +-
tests/README.md | 2 +-
tests/kafkatest/__init__.py | 4 +-
.../sanity_checks/test_verifiable_producer.py | 2 +-
tests/kafkatest/services/kafka/kafka.py | 7 +-
.../tests/streams/streams_upgrade_test.py | 4 +-
tests/kafkatest/utils/util.py | 9 ++
tests/kafkatest/version.py | 2 +-
61 files changed, 556 insertions(+), 382 deletions(-)