You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2017/03/05 12:53:28 UTC
[1/2] kylin git commit: Revert "KYLIN-2465 Web page has invalid tips
for streaming cube"
Repository: kylin
Updated Branches:
refs/heads/master 29dc1dd09 -> dd7507a59
Revert "KYLIN-2465 Web page has invalid tips for streaming cube"
This reverts commit cdfde7cb1ecb583af56dfb2f1255f819b1d93131.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/20ab0d65
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/20ab0d65
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/20ab0d65
Branch: refs/heads/master
Commit: 20ab0d65a2f7a47ff666baddbdf1d58b51356a63
Parents: 29dc1dd
Author: shaofengshi <sh...@apache.org>
Authored: Sun Mar 5 20:51:44 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Sun Mar 5 20:51:44 2017 +0800
----------------------------------------------------------------------
webapp/app/partials/cubes/cubes.html | 1 +
.../app/partials/cubes/streaming_build_tip.html | 25 ++++++++++++++++++++
2 files changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/20ab0d65/webapp/app/partials/cubes/cubes.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 980ce9b..7fc3adb 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -137,6 +137,7 @@
</div>
<div ng-include="'partials/jobs/job_submit.html'"></div>
+<div ng-include="'partials/cubes/streaming_build_tip.html'"></div>
<div ng-include="'partials/jobs/job_refresh.html'"></div>
<div ng-include="'partials/jobs/job_merge.html'"></div>
<div ng-include="'partials/projects/project_create.html'"></div>
http://git-wip-us.apache.org/repos/asf/kylin/blob/20ab0d65/webapp/app/partials/cubes/streaming_build_tip.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/streaming_build_tip.html b/webapp/app/partials/cubes/streaming_build_tip.html
new file mode 100644
index 0000000..80c5875
--- /dev/null
+++ b/webapp/app/partials/cubes/streaming_build_tip.html
@@ -0,0 +1,25 @@
+<!--
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+-->
+
+<script type="text/ng-template" id="streamingBuild.html">
+ <div class="callout callout-info">
+ <button type="button" class="close" data-dismiss="alert" ng-click="cancel()">�</button>
+ <h4><i class="fa fa-bullhorn"></i> Tips</h4>
+ Streaming cube build is not supported on UI, click <a href="{{streamingBuildUrl}}" style="color:blue;" target="_blank">here</a> to see how to schedule streaming cube.
+ </div>
+</script>
[2/2] kylin git commit: KYLIN-2465 remove invalid tips for streaming
cube
Posted by sh...@apache.org.
KYLIN-2465 remove invalid tips for streaming cube
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/dd7507a5
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/dd7507a5
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/dd7507a5
Branch: refs/heads/master
Commit: dd7507a5923a07baff99f72f88a86f74839f56eb
Parents: 20ab0d6
Author: shaofengshi <sh...@apache.org>
Authored: Sun Mar 5 20:53:26 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Sun Mar 5 20:53:26 2017 +0800
----------------------------------------------------------------------
webapp/app/partials/cubes/streaming_build_tip.html | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/dd7507a5/webapp/app/partials/cubes/streaming_build_tip.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/streaming_build_tip.html b/webapp/app/partials/cubes/streaming_build_tip.html
index 80c5875..7cdd2aa 100644
--- a/webapp/app/partials/cubes/streaming_build_tip.html
+++ b/webapp/app/partials/cubes/streaming_build_tip.html
@@ -19,7 +19,5 @@
<script type="text/ng-template" id="streamingBuild.html">
<div class="callout callout-info">
<button type="button" class="close" data-dismiss="alert" ng-click="cancel()">�</button>
- <h4><i class="fa fa-bullhorn"></i> Tips</h4>
- Streaming cube build is not supported on UI, click <a href="{{streamingBuildUrl}}" style="color:blue;" target="_blank">here</a> to see how to schedule streaming cube.
</div>
</script>