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/01/23 09:30:45 UTC

[04/51] [abbrv] incubator-kylin git commit: minor bug fix

minor bug fix


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

Branch: refs/heads/staging
Commit: 23d443fe312db54fdcf175427fa282a85771c0c6
Parents: 154de8a
Author: honma <ho...@ebay.com>
Authored: Mon Jan 19 18:21:05 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Mon Jan 19 18:21:05 2015 +0800

----------------------------------------------------------------------
 .../cube_desc/test_kylin_cube_without_slr_left_join_desc.json  | 6 +++---
 webapp/app/js/services/ngLoading.js                            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/23d443fe/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
index d79ae72..b7c275b 100644
--- a/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
+++ b/examples/test_case_data/localmeta/cube_desc/test_kylin_cube_without_slr_left_join_desc.json
@@ -181,9 +181,9 @@
         "parameter": {
           "type": "column",
           "value": "seller_id"
-        },
-        "dependent_measure_ref" : "seller_cnt_hll"
-      }
+        }
+      },
+      "dependent_measure_ref" : "seller_cnt_hll"
     },
     {
       "id": "7",

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/23d443fe/webapp/app/js/services/ngLoading.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/services/ngLoading.js b/webapp/app/js/services/ngLoading.js
index aefb3be..8afbee7 100644
--- a/webapp/app/js/services/ngLoading.js
+++ b/webapp/app/js/services/ngLoading.js
@@ -6,7 +6,7 @@ module.provider('loadingRequest', function () {
 
         var loadTemplate = angular.element('<div class="kylinLoadingRequest"><div class="loadingOverlay" ></div>' +
             '<div id="loadingCntnr" class="showbox" style="opacity: 0; margin-top: 250px;">'+
-            '<div class="loadingWord" ><img src="/image/waiting.gif"><span>Please wait...</span></div>'+
+            '<div class="loadingWord" ><img src="image/waiting.gif"><span>Please wait...</span></div>'+
             '</div> </div>');
 
         var createOverlay = function () {
@@ -31,4 +31,4 @@ module.provider('loadingRequest', function () {
         }
 
     }]
-});
\ No newline at end of file
+});