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/04/04 01:13:56 UTC

[17/17] incubator-kylin git commit: merge pull request

merge pull request


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

Branch: refs/heads/master
Commit: eede2806e96d07ea2c99493f350508741e3f31ec
Parents: 6b5eec9 d6e4a70
Author: Yang Li <li...@apache.org>
Authored: Sat Apr 4 00:12:28 2015 +0100
Committer: Yang Li <li...@apache.org>
Committed: Sat Apr 4 00:12:28 2015 +0100

----------------------------------------------------------------------
 docs/Operations/Kylin Metadata Store.md              | 6 +++---
 jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/eede2806/jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java
----------------------------------------------------------------------
diff --cc jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java
index 868daab,0fbd55a..5198fd7
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java
+++ b/jdbc/src/main/java/org/apache/kylin/jdbc/Driver.java
@@@ -89,7 -89,6 +89,7 @@@ public class Driver extends Unregistere
              throw new RuntimeException("Error occurred while registering JDBC driver " + Driver.class.getName() + ": " + e.toString());
          }
      }
- 
++    
      @Override
      protected DriverVersion createDriverVersion() {
          return DriverVersion.load(Driver.class, "org-apache-kylin-jdbc.properties", "Kylin JDBC Driver", "unknown version", "Kylin", "unknown version");