You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/04/26 06:17:40 UTC
[08/39] incubator-kylin git commit: Merge branch 'staging' of
https://github.com/KylinOLAP/Kylin into staging
Merge branch 'staging' of https://github.com/KylinOLAP/Kylin into staging
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/857daad0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/857daad0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/857daad0
Branch: refs/heads/staging
Commit: 857daad065d4de594245fb74724396400ba694b1
Parents: 4e1d098 2f15260
Author: lukehan <lu...@apache.org>
Authored: Tue Apr 14 14:24:01 2015 +0800
Committer: lukehan <lu...@apache.org>
Committed: Tue Apr 14 14:24:01 2015 +0800
----------------------------------------------------------------------
.../apache/kylin/dict/DictionaryManager.java | 2 +-
.../cube_desc/kylin_sales_cube_desc.json | 24 +++++---------------
.../test_kylin_cube_with_slr_desc.json | 6 ++---
...test_kylin_cube_with_slr_left_join_desc.json | 6 ++---
.../test_kylin_cube_without_slr_desc.json | 6 ++---
...t_kylin_cube_without_slr_left_join_desc.json | 6 ++---
.../metadata/measure/MeasureAggregator.java | 2 +-
7 files changed, 20 insertions(+), 32 deletions(-)
----------------------------------------------------------------------