Skip to content
代码片段 群组 项目
提交 e3d7b344 编辑于 作者: Stanislav Kozlovski's avatar Stanislav Kozlovski
浏览文件

Merge remote-tracking branch 'origin/master' into june-15-ce-kafka-merge

 Conflicts:
	core/src/test/scala/integration/kafka/admin/ReassignPartitionsIntegrationTest.scala
	core/src/test/scala/integration/kafka/server/QuorumTestHarness.scala
Pretty simple conflicts

Properly mock KafkaChannelTest proxy protocol unit tests

Fix mocking in SaslServerAuthenticator test

Fix nits
No related branches found
No related tags found
无相关合并请求
显示
268 个添加77 个删除
加载中
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册