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/03/03 11:08:06 UTC

[10/26] incubator-kylin git commit: Merge branch 'streaming' of https://github.com/KylinOLAP/Kylin into streaming

Merge branch 'streaming' of https://github.com/KylinOLAP/Kylin into streaming


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

Branch: refs/heads/streaming
Commit: 04d9b7d60f01f10681da03cc7525153fd27dacdd
Parents: 06e4b20 bd0b9f7
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Sat Feb 28 09:41:26 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Sat Feb 28 09:41:26 2015 +0800

----------------------------------------------------------------------
 .../kylin/rest/controller/CubeController.java   | 38 +++++++++++++++-----
 webapp/app/js/controllers/cubeEdit.js           | 12 +++++++
 webapp/app/js/controllers/cubeSchema.js         | 30 ++++++++++++++++
 webapp/app/js/controllers/cubes.js              |  5 ++-
 webapp/app/js/filters/filter.js                 |  4 +--
 webapp/app/partials/cubeDesigner/measures.html  | 15 +++-----
 6 files changed, 82 insertions(+), 22 deletions(-)
----------------------------------------------------------------------