kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaofeng...@apache.org
Subject [18/18] kylin git commit: update version number
Date Mon, 25 Jul 2016 12:15:37 GMT
update version number


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

Branch: refs/heads/1.5.x-HBase1.x
Commit: 9bac8386b7cbff36bae78d4e458a276fc7d0bf42
Parents: 4cdc07e
Author: shaofengshi <shaofengshi@apache.org>
Authored: Sat Jun 4 08:24:38 2016 +0800
Committer: shaofengshi <shaofengshi@apache.org>
Committed: Mon Jul 25 20:13:38 2016 +0800

----------------------------------------------------------------------
 core-metadata/pom.xml | 2 +-
 jdbc/pom.xml          | 4 ++++
 server/pom.xml        | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/9bac8386/core-metadata/pom.xml
----------------------------------------------------------------------
diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml
index 1a2c5e8..3c1ee0b 100644
--- a/core-metadata/pom.xml
+++ b/core-metadata/pom.xml
@@ -28,7 +28,7 @@
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
         <version>1.5.3</version>
-        
+
     </parent>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/kylin/blob/9bac8386/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index e86998e..ff83568 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -27,7 +27,11 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
+<<<<<<< 571874049bdb9139afdc467474b53a1d63be818b
         <version>1.5.3</version>
+=======
+        <version>1.5.2.1</version>
+>>>>>>> update version number
 
     </parent>
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/9bac8386/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index bca91fb..e0a4110 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,7 +28,11 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
+<<<<<<< 571874049bdb9139afdc467474b53a1d63be818b
         <version>1.5.3</version>
+=======
+        <version>1.5.2.1</version>
+>>>>>>> update version number
 
     </parent>
 


Mime
View raw message