Repository: sentry Updated Branches: refs/heads/master fc5cd5a47 -> 793cb5d24
SENTRY-1070: Rename kafka.superusers -> super.users based on kafka docs (Ashish K Singh via Dapeng Sun) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/793cb5d2 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/793cb5d2 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/793cb5d2 Branch: refs/heads/master Commit: 793cb5d245274c9ccd490383c7ef9c1cd993e09a Parents: fc5cd5a Author: Ashish K Singh <[email protected]> Authored: Tue May 3 16:08:24 2016 +0800 Committer: Sun Dapeng <[email protected]> Committed: Tue May 3 16:08:24 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java | 2 +- .../java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/793cb5d2/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java b/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java index 2f4f8df..3b1cb9c 100644 --- a/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java +++ b/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java @@ -27,7 +27,7 @@ public class KafkaAuthConf extends Configuration { */ public static final String SENTRY_KAFKA_SITE_URL = "sentry.kafka.site.url"; public static final String AUTHZ_SITE_FILE = "sentry-site.xml"; - public static final String KAFKA_SUPER_USERS = "kafka.superusers"; + public static final String KAFKA_SUPER_USERS = "super.users"; public static final String KAFKA_SERVICE_INSTANCE_NAME = "sentry.kafka.service.instance"; public static final String KAFKA_SERVICE_USER_NAME = "sentry.kafka.service.user.name"; public static final String KAFKA_PRINCIPAL_HOSTNAME = "sentry.kafka.principal.hostname"; http://git-wip-us.apache.org/repos/asf/sentry/blob/793cb5d2/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java index 2a3b317..b82c028 100644 --- a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java +++ b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java @@ -99,7 +99,7 @@ public class KafkaTestServer { props.put("ssl.truststore.password", "test-ts-passwd"); props.put("security.inter.broker.protocol", "SSL"); props.put("ssl.client.auth", "required"); - props.put("kafka.superusers", "User:CN=superuser;User:CN=superuser1; User:CN=Superuser2 "); + props.put("super.users", "User:CN=superuser;User:CN=superuser1; User:CN=Superuser2 "); } private void createKafkaServer() throws UnknownHostException {
