kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaofeng...@apache.org
Subject [39/50] [abbrv] incubator-kylin git commit: update version number for hard rollback after failed release attemp
Date Wed, 27 May 2015 04:35:04 GMT
update version number for hard rollback after failed release attemp


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

Branch: refs/heads/0.8.0
Commit: ef7879ae51f3ff2a74ae93793e30f2c3702755cc
Parents: 764ab4e
Author: lukehan <lukehan@apache.org>
Authored: Wed May 20 21:57:09 2015 +0800
Committer: shaofengshi <shaofengshi@apache.org>
Committed: Wed May 27 12:26:14 2015 +0800

----------------------------------------------------------------------
 atopcalcite/pom.xml | 4 ++++
 server/pom.xml      | 1 +
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ef7879ae/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 9450df4..9213005 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -28,10 +28,14 @@
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
 <<<<<<< HEAD
+<<<<<<< HEAD
         <version>0.7.1-incubating</version>
 =======
         <version>0.7.2-incubating-SNAPSHOT</version>
 >>>>>>> update version number for hard rollback after failed release
attemp
+=======
+        <version>0.7.1-incubating-SNAPSHOT</version>
+>>>>>>> update version number for hard rollback after failed release
attemp
     </parent>
 
     <properties>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ef7879ae/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index ef17c4e..c99ed94 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,6 +28,7 @@
     <parent>
         <groupId>org.apache.kylin</groupId>
         <artifactId>kylin</artifactId>
+        <version>0.7.1-incubating-SNAPSHOT</version>
     </parent>
 
     <properties>


Mime
View raw message