kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wangxia...@apache.org
Subject [03/32] kylin git commit: KYLIN-1316 update wrong label in cube refresh page
Date Mon, 18 Jan 2016 05:38:58 GMT
KYLIN-1316 update wrong label in cube refresh page


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

Branch: refs/heads/KYLIN-1122
Commit: f47ae3ae104ca739ae83783797e12dc8df4adf7b
Parents: dab8891
Author: jian <zhongjian@apache.org>
Authored: Thu Jan 14 14:01:27 2016 +0800
Committer: Xiaoyu Wang <wangxiaoyu@apache.org>
Committed: Mon Jan 18 13:38:30 2016 +0800

----------------------------------------------------------------------
 ...pdate-wrong-label-in-cube-refresh-page.patch | 25 --------------------
 webapp/app/partials/jobs/job_refresh.html       |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/f47ae3ae/0001-KYLIN-1316-update-wrong-label-in-cube-refresh-page.patch
----------------------------------------------------------------------
diff --git a/0001-KYLIN-1316-update-wrong-label-in-cube-refresh-page.patch b/0001-KYLIN-1316-update-wrong-label-in-cube-refresh-page.patch
deleted file mode 100644
index 5da7612..0000000
--- a/0001-KYLIN-1316-update-wrong-label-in-cube-refresh-page.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7217298239ffa38252a30232fb11322810876f1b Mon Sep 17 00:00:00 2001
-From: jian <zhongjian@apache.org>
-Date: Thu, 14 Jan 2016 10:56:36 +0800
-Subject: [PATCH] KYLIN-1316 update wrong label in cube refresh page
-
----
- webapp/app/partials/jobs/job_refresh.html | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/webapp/app/partials/jobs/job_refresh.html b/webapp/app/partials/jobs/job_refresh.html
-index 89705e0..b8ffa6e 100644
---- a/webapp/app/partials/jobs/job_refresh.html
-+++ b/webapp/app/partials/jobs/job_refresh.html
-@@ -35,7 +35,7 @@
-                             <td>{{metaModel.model.partition_desc.partition_date_column}}</td>
-                         </tr>
-                         <tr>
--                            <td>MERGE START SEGMENT</td>
-+                            <td>REFRESH SEGMENT</td>
-                             <td>
-                                 <select ng-model="selectedSegment"
-                                         ng-init="selectedSegment=cube.segments[0];segmentSelected(selectedSegment);"
--- 
-2.4.9 (Apple Git-60)
-

http://git-wip-us.apache.org/repos/asf/kylin/blob/f47ae3ae/webapp/app/partials/jobs/job_refresh.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/job_refresh.html b/webapp/app/partials/jobs/job_refresh.html
index 89705e0..b8ffa6e 100644
--- a/webapp/app/partials/jobs/job_refresh.html
+++ b/webapp/app/partials/jobs/job_refresh.html
@@ -35,7 +35,7 @@
                             <td>{{metaModel.model.partition_desc.partition_date_column}}</td>
                         </tr>
                         <tr>
-                            <td>MERGE START SEGMENT</td>
+                            <td>REFRESH SEGMENT</td>
                             <td>
                                 <select ng-model="selectedSegment"
                                         ng-init="selectedSegment=cube.segments[0];segmentSelected(selectedSegment);"


Mime
View raw message