Merge commit 'c962feb75605c1919b88ce5b435e814efab626de' into kap-2.4.x

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

Branch: refs/heads/2.1.x
Commit: f52190b12c929f16f8f9aa24aa384af9d88eb259
Parents: 1cae1f5 c962feb
Author: Hongbin Ma <mahong...@apache.org>
Authored: Fri Aug 11 13:23:42 2017 +0800
Committer: Hongbin Ma <mahong...@apache.org>
Committed: Fri Aug 11 13:23:42 2017 +0800

----------------------------------------------------------------------
 .../acl/0928468a-9fab-4185-9a14-6f2e7c74823f    | 27 ++++++++++++++++++++
 .../acl/2fbca32a-a33e-4b69-83dd-0bb8b1f8c53b    | 27 ++++++++++++++++++++
 .../acl/2fbca32a-a33e-4b69-83dd-0bb8b1f8c91b    | 24 +++++++++++++++++
 examples/sample_cube/template/user/ADMIN        | 19 ++++++++++++++
 .../apache/kylin/rest/service/AclService.java   |  4 +--
 .../coprocessor/endpoint/CubeVisitService.java  | 18 ++++++-------
 webapp/app/partials/cubeDesigner/measures.html  |  3 ++-
 7 files changed, 109 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


Reply via email to