You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2018/01/24 05:51:30 UTC
kylin git commit: KYLIN-3191
Repository: kylin
Updated Branches:
refs/heads/master 52479bee2 -> fce4c5a3b
KYLIN-3191
Signed-off-by: Billy Liu <bi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fce4c5a3
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fce4c5a3
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fce4c5a3
Branch: refs/heads/master
Commit: fce4c5a3b9809a140b6fbcd4b41f0101a5f34758
Parents: 52479be
Author: peng.jianhua <pe...@zte.com.cn>
Authored: Wed Jan 24 13:37:52 2018 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Wed Jan 24 13:51:03 2018 +0800
----------------------------------------------------------------------
.../src/main/resources/kylin-backward-compatibility.properties | 1 -
core-common/src/main/resources/kylin-defaults.properties | 3 +--
examples/test_case_data/localmeta/kylin.properties | 3 +--
examples/test_case_data/sandbox/kylin.properties | 3 +--
4 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/fce4c5a3/core-common/src/main/resources/kylin-backward-compatibility.properties
----------------------------------------------------------------------
diff --git a/core-common/src/main/resources/kylin-backward-compatibility.properties b/core-common/src/main/resources/kylin-backward-compatibility.properties
index 687c6a0..05f5b11 100644
--- a/core-common/src/main/resources/kylin-backward-compatibility.properties
+++ b/core-common/src/main/resources/kylin-backward-compatibility.properties
@@ -195,7 +195,6 @@ kylin.query.metrics.percentiles.intervals=kylin.server.query-metrics-percentiles
### SECURITY ###
kylin.security.profile=kylin.security.profile
-acl.defaultRole=kylin.security.acl.default-role
acl.adminRole=kylin.security.acl.admin-role
ldap.server=kylin.security.ldap.connection-server
ldap.username=kylin.security.ldap.connection-username
http://git-wip-us.apache.org/repos/asf/kylin/blob/fce4c5a3/core-common/src/main/resources/kylin-defaults.properties
----------------------------------------------------------------------
diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties
index e87b31d..edc3955 100644
--- a/core-common/src/main/resources/kylin-defaults.properties
+++ b/core-common/src/main/resources/kylin-defaults.properties
@@ -242,8 +242,7 @@ kylin.query.transformers=org.apache.kylin.query.util.DefaultQueryTransformer,org
# with "testing" profile, user can use pre-defined name/pwd like KYLIN/ADMIN to login
kylin.security.profile=testing
-# Default roles and admin roles in LDAP, for ldap and saml
-kylin.security.acl.default-role=ROLE_ANALYST,ROLE_MODELER
+# Admin roles in LDAP, for ldap and saml
kylin.security.acl.admin-role=ROLE_ADMIN
# LDAP authentication configuration
http://git-wip-us.apache.org/repos/asf/kylin/blob/fce4c5a3/examples/test_case_data/localmeta/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties
index 962f916..1e3f2ff 100644
--- a/examples/test_case_data/localmeta/kylin.properties
+++ b/examples/test_case_data/localmeta/kylin.properties
@@ -92,8 +92,7 @@ kylin.query.transformers=org.apache.kylin.query.util.DefaultQueryTransformer,org
# with "testing" profile, user can use pre-defined name/pwd like KYLIN/ADMIN to login
kylin.security.profile=testing
-# Default roles and admin roles in LDAP, for ldap and saml
-kylin.security.acl.default-role=ROLE_ANALYST,ROLE_MODELER
+# Admin roles in LDAP, for ldap and saml
kylin.security.acl.admin-role=ROLE_ADMIN
# LDAP authentication configuration
http://git-wip-us.apache.org/repos/asf/kylin/blob/fce4c5a3/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
index 13d62a2..c966999 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -140,8 +140,7 @@ kylin.query.security-enabled=true
# with "testing" profile, user can use pre-defined name/pwd like KYLIN/ADMIN to login
kylin.security.profile=testing
-# Default roles and admin roles in LDAP, for ldap and saml
-kylin.security.acl.default-role=ROLE_ANALYST,ROLE_MODELER
+# Admin roles in LDAP, for ldap and saml
kylin.security.acl.admin-role=ROLE_ADMIN