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/02/12 06:43:12 UTC
[22/50] incubator-kylin git commit: merge conflict
merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/59411d92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/59411d92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/59411d92
Branch: refs/heads/inverted-index
Commit: 59411d923ffad52d75efc22d15b6176c520a678e
Parents: a2383a5
Author: jiazhong <ji...@ebay.com>
Authored: Wed Feb 11 10:28:15 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Wed Feb 11 10:28:15 2015 +0800
----------------------------------------------------------------------
.gitignore | 0
bin/check-env.sh | 0
bin/start-kylin.sh | 0
bin/stop-kylin.sh | 0
conf/kylin.properties | 0
examples/test_case_data/sandbox-hdp21/kylin.properties | 0
examples/test_case_data/sandbox/kylin.properties | 0
script/package.sh | 0
webapp/app/css/AdminLTE-fonts.css | 0
webapp/app/css/AdminLTE.css | 0
.../ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 | Bin
...BGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 | Bin
webapp/app/index.html | 2 ++
webapp/app/js/controllers/cubeAdvanceSetting.js | 0
webapp/app/js/controllers/cubeDimensions.js | 0
webapp/app/js/controllers/cubeEdit.js | 0
webapp/app/js/controllers/cubeFilter.js | 0
webapp/app/js/controllers/cubeModel.js | 0
webapp/app/js/controllers/cubeRefresh.js | 0
webapp/app/js/controllers/cubeSchema.js | 0
webapp/app/js/controllers/page.js | 0
webapp/app/js/controllers/projects.js | 0
webapp/app/js/controllers/sourceMeta.js | 0
webapp/app/js/filters/filter.js | 0
webapp/app/js/model/cubeConfig.js | 0
webapp/app/js/model/cubesManager.js | 0
webapp/app/js/model/jobConfig.js | 0
webapp/app/js/model/metaModel.js | 0
webapp/app/js/model/projectConfig.js | 0
webapp/app/js/model/projectModel.js | 0
webapp/app/js/model/tableConfig.js | 0
webapp/app/js/model/tableModel.js | 0
webapp/app/partials/cubes/cube_json_edit.html | 0
webapp/app/partials/jobs/job_submit.html | 1 -
webapp/app/partials/projects/projects.html | 0
webapp/app/partials/tables/source_metadata.html | 0
webapp/bower.json | 0
webapp/grunt.json | 0
38 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/bin/check-env.sh
----------------------------------------------------------------------
diff --git a/bin/check-env.sh b/bin/check-env.sh
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/bin/start-kylin.sh
----------------------------------------------------------------------
diff --git a/bin/start-kylin.sh b/bin/start-kylin.sh
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/bin/stop-kylin.sh
----------------------------------------------------------------------
diff --git a/bin/stop-kylin.sh b/bin/stop-kylin.sh
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/conf/kylin.properties b/conf/kylin.properties
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/examples/test_case_data/sandbox-hdp21/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox-hdp21/kylin.properties b/examples/test_case_data/sandbox-hdp21/kylin.properties
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/examples/test_case_data/sandbox/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/script/package.sh
----------------------------------------------------------------------
diff --git a/script/package.sh b/script/package.sh
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/css/AdminLTE-fonts.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE-fonts.css b/webapp/app/css/AdminLTE-fonts.css
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/css/AdminLTE.css
----------------------------------------------------------------------
diff --git a/webapp/app/css/AdminLTE.css b/webapp/app/css/AdminLTE.css
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2
----------------------------------------------------------------------
diff --git a/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2 b/webapp/app/fonts/ODelI1aHBYDBqgeIAH2zlPytCVloACqnDHJwh-em2k8.woff2
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
----------------------------------------------------------------------
diff --git a/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2 b/webapp/app/fonts/toadOcfmlt9b38dHJxOBGKUt5Ot5NIMarvNW-hkYWvT3rGVtsTkPsbDajuO5ueQw.woff2
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
old mode 100755
new mode 100644
index f4c4b25..df87007
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -136,6 +136,8 @@
<script src="js/model/metaModel.js"></script>
<script src="js/model/projectModel.js"></script>
<script src="js/model/tableModel.js"></script>
+<script src="js/model/cubeListModel.js"></script>
+<script src="js/model/jobListModel.js"></script>
<script src="js/controllers/page.js"></script>
<script src="js/controllers/index.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/cubeAdvanceSetting.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js b/webapp/app/js/controllers/cubeAdvanceSetting.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/cubeDimensions.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeDimensions.js b/webapp/app/js/controllers/cubeDimensions.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/cubeFilter.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeFilter.js b/webapp/app/js/controllers/cubeFilter.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/cubeModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeModel.js b/webapp/app/js/controllers/cubeModel.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/cubeRefresh.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeRefresh.js b/webapp/app/js/controllers/cubeRefresh.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/cubeSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/page.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/projects.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/projects.js b/webapp/app/js/controllers/projects.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/controllers/sourceMeta.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/filters/filter.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/filters/filter.js b/webapp/app/js/filters/filter.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/model/cubeConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/model/cubesManager.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubesManager.js b/webapp/app/js/model/cubesManager.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/model/jobConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/jobConfig.js b/webapp/app/js/model/jobConfig.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/model/metaModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/metaModel.js b/webapp/app/js/model/metaModel.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/model/projectConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/projectConfig.js b/webapp/app/js/model/projectConfig.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/model/projectModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/projectModel.js b/webapp/app/js/model/projectModel.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/model/tableConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/tableConfig.js b/webapp/app/js/model/tableConfig.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/js/model/tableModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/tableModel.js b/webapp/app/js/model/tableModel.js
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/partials/cubes/cube_json_edit.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cube_json_edit.html b/webapp/app/partials/cubes/cube_json_edit.html
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/partials/jobs/job_submit.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/job_submit.html b/webapp/app/partials/jobs/job_submit.html
old mode 100755
new mode 100644
index 49af1e9..b3f917b
--- a/webapp/app/partials/jobs/job_submit.html
+++ b/webapp/app/partials/jobs/job_submit.html
@@ -35,7 +35,6 @@
<tr>
<td>Start Date (Include)</td>
<td>
- <!--cubes.js loadDetail function has convert from GMT mills to GMT string,reverse local -->
<!--no need convert UTC again-->
<div ng-if="cube.segments.length == 0">
{{jobBuildRequest.startTime =
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/partials/projects/projects.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/projects/projects.html b/webapp/app/partials/projects/projects.html
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/app/partials/tables/source_metadata.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/tables/source_metadata.html b/webapp/app/partials/tables/source_metadata.html
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/bower.json
----------------------------------------------------------------------
diff --git a/webapp/bower.json b/webapp/bower.json
old mode 100755
new mode 100644
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/59411d92/webapp/grunt.json
----------------------------------------------------------------------
diff --git a/webapp/grunt.json b/webapp/grunt.json
old mode 100755
new mode 100644