mirror of https://github.com/apache/kafka.git
				
				
				
			| 
				
	
				CI / build (push) Has been cancelled
				
					Details
				
			 Reviewers: Colin P. McCabe <cmccabe@apache.org>
```
Conflicts:
    clients/src/main/java/org/apache/kafka/common/requests/AlterUserScramCredentialsRequest.java - import statement
    clients/src/main/java/org/apache/kafka/common/requests/IncrementalAlterConfigsRequest.java - import statement
    core/src/test/scala/unit/kafka/server/KafkaApisTest.scala - different logging and metadatacache instantiation
```
Cherry-Picked-From:  | ||
|---|---|---|
| .. | ||
| .scalafmt.conf | ||
| checkstyle.xml | ||
| import-control-coordinator-common.xml | ||
| import-control-core.xml | ||
| import-control-group-coordinator.xml | ||
| import-control-jmh-benchmarks.xml | ||
| import-control-metadata.xml | ||
| import-control-server-common.xml | ||
| import-control-server.xml | ||
| import-control-share-coordinator.xml | ||
| import-control-storage.xml | ||
| import-control-test-common-internal-api.xml | ||
| import-control-test-common-runtime.xml | ||
| import-control-test-common-util.xml | ||
| import-control-transaction-coordinator.xml | ||
| import-control.xml | ||
| java.header | ||
| suppressions.xml | ||