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 2015/11/05 06:23:36 UTC
[4/6] incubator-kylin git commit: KYLIN-999 remove ref to Admin-fonts
KYLIN-999 remove ref to Admin-fonts
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/7ad648c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7ad648c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7ad648c7
Branch: refs/heads/2.x-staging
Commit: 7ad648c7c1998291e39828c16f6b7b3e03efac0c
Parents: 56a5db7
Author: jiazhong <ji...@ebay.com>
Authored: Wed Nov 4 11:36:47 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 11:54:26 2015 +0800
----------------------------------------------------------------------
pom.xml | 12 +++++++++---
webapp/app/index.html | 1 -
webapp/grunt.json | 1 -
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ad648c7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8332ee0..37b5f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<commons-collections4.version>4.0</commons-collections4.version>
<commons-email.version>1.1</commons-email.version>
<commons-math3.version>3.5</commons-math3.version>
-
+
<!-- Spark -->
<spark.version>1.3.0</spark.version>
@@ -857,6 +857,12 @@
<exclude>webapp/app/css/AdminLTE-fonts.css</exclude>
<exclude>webapp/app/css/AdminLTE.css</exclude>
+ <!--configuration file -->
+ <exclude>webapp/app/routes.json</exclude>
+ <exclude>webapp/bower.json</exclude>
+ <exclude>webapp/grunt.json</exclude>
+ <exclude>webapp/package.json</exclude>
+
<!-- jdbc log -->
<exclude>jdbc/kylin_jdbc.log*</exclude>
<!-- server log -->
@@ -865,7 +871,7 @@
<!-- HBase MiniCluster Testing Data, for testing only -->
<exclude>examples/test_case_data/minicluster/hbase-export.tar.gz</exclude>
<exclude>examples/test_case_data/**/*.xml</exclude>
-
+
<!--ODBC sub project is a VS project, exclude related files -->
<exclude>**/*.sln</exclude>
<exclude>**/*.vcxproj</exclude>
@@ -924,4 +930,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ad648c7/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index caa8d2a..6e5d463 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -41,7 +41,6 @@
<link rel="stylesheet" type="text/css" href="components/animate.css/animate.css">
<link rel="stylesheet" type="text/css" href="components/nvd3/nv.d3.min.css">
- <link rel="stylesheet" type="text/css" href="css/AdminLTE-fonts.css">
<link rel="stylesheet" type="text/css" href="css/AdminLTE.css">
<link rel="stylesheet" type="text/css" href="components/bootstrap-sweetalert/lib/sweet-alert.css">
<link rel="stylesheet" type="text/css" href="components/angular-bootstrap-nav-tree/dist/abn_tree.css">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7ad648c7/webapp/grunt.json
----------------------------------------------------------------------
diff --git a/webapp/grunt.json b/webapp/grunt.json
index 1750014..ef56991 100755
--- a/webapp/grunt.json
+++ b/webapp/grunt.json
@@ -49,7 +49,6 @@
"src": [
"app/components/bootstrap/dist/css/bootstrap.min.css",
"app/components/components-font-awesome/css/font-awesome.css",
- "app/css/AdminLTE-fonts.css",
"app/components/ng-grid/ng-grid.css",
"app/components/angular-tree-control/css/tree-control.css",
"app/components/angular-tree-control/css/tree-control-attribute.css",