Merge commit 'b0dfc049c1b4cd39d943de0a7a8760ba3d6fdfab' into kap-2.5.x
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/07611955 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/07611955 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/07611955 Branch: refs/heads/2.2.x Commit: 0761195598f44a33f971399c006b40450be3828b Parents: 622bafe b0dfc04 Author: lidongsjtu <[email protected]> Authored: Thu Oct 12 20:19:20 2017 +0800 Committer: lidongsjtu <[email protected]> Committed: Thu Oct 12 20:19:20 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(-) ----------------------------------------------------------------------
