kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From guozh...@apache.org
Subject kafka git commit: HOTFIX: remove mis-merges from the previous commit
Date Sat, 02 Dec 2017 08:21:16 GMT
Repository: kafka
Updated Branches:
  refs/heads/0.11.0 d2a95ec07 -> b81bf0e3d


HOTFIX: remove mis-merges from the previous commit


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/b81bf0e3
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/b81bf0e3
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/b81bf0e3

Branch: refs/heads/0.11.0
Commit: b81bf0e3df6625a264c539b732f03c3cd941e620
Parents: d2a95ec
Author: Guozhang Wang <wangguoz@gmail.com>
Authored: Sat Dec 2 00:21:06 2017 -0800
Committer: Guozhang Wang <wangguoz@gmail.com>
Committed: Sat Dec 2 00:21:06 2017 -0800

----------------------------------------------------------------------
 .../integration/kafka/api/SaslEndToEndAuthorizationTest.scala   | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/b81bf0e3/core/src/test/scala/integration/kafka/api/SaslEndToEndAuthorizationTest.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/integration/kafka/api/SaslEndToEndAuthorizationTest.scala
b/core/src/test/scala/integration/kafka/api/SaslEndToEndAuthorizationTest.scala
index f9b3bda..2361013 100644
--- a/core/src/test/scala/integration/kafka/api/SaslEndToEndAuthorizationTest.scala
+++ b/core/src/test/scala/integration/kafka/api/SaslEndToEndAuthorizationTest.scala
@@ -21,12 +21,7 @@ import java.util.Properties
 import kafka.utils.TestUtils
 import org.apache.kafka.common.protocol.SecurityProtocol
 import org.apache.kafka.common.config.SaslConfigs
-<<<<<<< HEAD
-import org.apache.kafka.common.errors.GroupAuthorizationException
-=======
-import org.apache.kafka.common.security.auth.SecurityProtocol
 import org.apache.kafka.common.errors.{GroupAuthorizationException, TopicAuthorizationException}
->>>>>>> 2d8918b... KAFKA-6118: Fix transient failure testTwoConsumersWithDifferentSaslCredentials
 import org.junit.{Before, Test}
 import org.junit.Assert.{assertEquals, assertTrue}
 


Mime
View raw message