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 2017/10/12 13:52:44 UTC

kylin git commit: Merge commit 'b0dfc049c1b4cd39d943de0a7a8760ba3d6fdfab' [Forced Update!]

Repository: kylin
Updated Branches:
  refs/heads/2.2.x 076119559 -> 2c9007796 (forced update)


Merge commit 'b0dfc049c1b4cd39d943de0a7a8760ba3d6fdfab'


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

Branch: refs/heads/2.2.x
Commit: 2c9007796e1d19035385fc9b9b3e7f59897aece2
Parents: 622bafe b0dfc04
Author: lidongsjtu <li...@apache.org>
Authored: Thu Oct 12 20:19:20 2017 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Thu Oct 12 21:52:12 2017 +0800

----------------------------------------------------------------------
 build/script/download-tomcat.sh                 |  4 +--
 .../org/apache/kylin/common/KylinVersion.java   |  2 +-
 .../main/resources/kylin-defaults.properties    |  2 +-
 .../kylin/cube/gridtable/RecordComparators.java | 18 +++++++++++---
 .../storage/gtrecord/DictGridTableTest.java     |  8 ++++++
 .../algorithm/ITGeneticAlgorithmTest.java       |  2 +-
 pom.xml                                         |  2 +-
 webapp/app/js/controllers/access.js             | 10 ++++----
 webapp/app/js/controllers/streamingConfig.js    |  8 +++---
 webapp/app/js/listeners.js                      |  8 +++---
 webapp/app/partials/common/access.html          |  8 +++---
 webapp/app/partials/cubes/cube_detail.html      | 26 ++++++++++----------
 12 files changed, 59 insertions(+), 39 deletions(-)
----------------------------------------------------------------------