----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/33431/ -----------------------------------------------------------
Review request for kafka. Bugs: KAFKA-1688 https://issues.apache.org/jira/browse/KAFKA-1688 Repository: kafka Description ------- KAFKA-1688: initial check in. Merge remote-tracking branch 'origin/trunk' into trunk Merge remote-tracking branch 'origin/trunk' into 2032 Merge branch '2032' into trunk KAFKA-1688: Add authorization. Merge remote-tracking branch 'origin/trunk' into trunk Conflicts: core/src/main/scala/kafka/admin/AdminUtils.scala core/src/main/scala/kafka/admin/TopicCommand.scala core/src/main/scala/kafka/network/RequestChannel.scala core/src/main/scala/kafka/server/KafkaApis.scala core/src/main/scala/kafka/server/KafkaServer.scala core/src/test/scala/unit/kafka/admin/TopicCommandTest.scala Fixing some merge errors. Merge remote-tracking branch 'origin/trunk' into trunk Conflicts: core/src/main/scala/kafka/common/ErrorMapping.scala Converted some code to idomatic scala. Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk Removing some unintended changes. Reverting the topic config related changes public classes and interfaces to support pluggable authorizer implementation for kafka Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk all public entities for pluggable authorizer support in kafka. Diffs ----- core/src/main/scala/kafka/common/AuthorizationException.scala PRE-CREATION core/src/main/scala/kafka/common/ErrorMapping.scala c75c68589681b2c9d6eba2b440ce5e58cddf6370 core/src/main/scala/kafka/network/RequestChannel.scala 1d0024c8f0c2ab0efa6d8cfca6455877a6ed8026 core/src/main/scala/kafka/security/auth/Acl.scala PRE-CREATION core/src/main/scala/kafka/security/auth/Authorizer.scala PRE-CREATION core/src/main/scala/kafka/security/auth/KafkaPrincipal.scala PRE-CREATION core/src/main/scala/kafka/security/auth/Operation.java PRE-CREATION core/src/main/scala/kafka/security/auth/PermissionType.java PRE-CREATION core/src/main/scala/kafka/server/KafkaApis.scala b4004aa3a1456d337199aa1245fb0ae61f6add46 core/src/main/scala/kafka/server/KafkaConfig.scala cfbbd2be550947dd2b3c8c2cab981fa08fb6d859 core/src/main/scala/kafka/server/KafkaServer.scala c63f4ba9d622817ea8636d4e6135fba917ce085a core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala 62d183248e3be4c83d2c768e762f61f92448c6a6 Diff: https://reviews.apache.org/r/33431/diff/ Testing ------- Thanks, Parth Brahmbhatt