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 11baf82d48b40efca9f44c106d7e8dadc62ffa8f
Merge: 0cc0279 796fae2
Author: Brian Byrne <bdby...@gmail.com>
AuthorDate: Thu Jul 16 09:46:56 2020 -0700
Merge branch 'apache/kafka/trunk' into 'master'.
build.gradle | 9 +-
.../kafka/clients/admin/KafkaAdminClient.java | 12 +-
.../kafka/clients/consumer/ConsumerConfig.java | 14 ++
.../kafka/clients/consumer/KafkaConsumer.java | 2 +-
.../kafka/clients/producer/KafkaProducer.java | 2 +-
.../kafka/clients/producer/ProducerConfig.java | 14 ++
.../kafka/clients/admin/KafkaAdminClientTest.java | 30 +++
.../kafka/clients/consumer/ConsumerConfigTest.java | 11 +-
.../kafka/clients/producer/ProducerConfigTest.java | 11 +-
.../kafka/connect/runtime/WorkerSinkTask.java | 3 +
.../connect/integration/BlockingConnectorTest.java | 13 +-
.../kafka/connect/runtime/WorkerSinkTaskTest.java | 54 +++++
.../util/clusters/EmbeddedConnectCluster.java | 2 -
core/src/main/scala/kafka/cluster/Partition.scala | 7 +-
.../transaction/TransactionCoordinator.scala | 20 +-
.../transaction/TransactionMetadata.scala | 14 +-
core/src/main/scala/kafka/log/LogCleaner.scala | 2 +-
.../main/scala/kafka/log/LogCleanerManager.scala | 7 +-
core/src/main/scala/kafka/log/LogManager.scala | 228 ++++++++++++++-------
.../main/scala/kafka/server/ReplicaManager.scala | 82 ++++----
.../integration/kafka/api/TransactionsTest.scala | 59 ++++++
.../transaction/TransactionCoordinatorTest.scala | 128 +++++++++++-
.../test/scala/unit/kafka/log/LogManagerTest.scala | 3 +-
.../unit/kafka/server/ReplicaManagerTest.scala | 42 +++-
docs/streams/core-concepts.html | 28 ++-
docs/streams/upgrade-guide.html | 2 +-
.../kafka/message/ApiMessageTypeGenerator.java | 18 +-
.../org/apache/kafka/message/MessageGenerator.java | 38 +++-
.../org/apache/kafka/message/SchemaGenerator.java | 4 +
.../apache/kafka/message/TypeClassGenerator.java | 43 ++++
.../processor/internals/StateDirectory.java | 18 +-
.../streams/processor/internals/StreamThread.java | 70 ++++---
.../internals/StreamsPartitionAssignor.java | 61 +++---
.../kafka/streams/processor/internals/Task.java | 4 +
.../streams/processor/internals/TaskManager.java | 38 ++++
.../processor/internals/StateDirectoryTest.java | 50 +++++
.../processor/internals/StreamThreadTest.java | 105 ++++++++++
.../internals/StreamsPartitionAssignorTest.java | 9 +-
.../processor/internals/TaskManagerTest.java | 44 +++-
tests/kafkatest/services/kafka/kafka.py | 28 ++-
tests/kafkatest/version.py | 3 +
41 files changed, 1089 insertions(+), 243 deletions(-)
