You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/05/22 04:58:04 UTC
[05/14] incubator-kylin git commit: update version number for hard
rollback after failed release attemp
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/51871fcc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/51871fcc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/51871fcc
Branch: refs/heads/0.7.1-staging
Commit: 51871fcc1c907ffde1df9a74bcfe520a2395691d
Parents: 7b1737b
Author: lukehan <lu...@apache.org>
Authored: Wed May 20 21:57:09 2015 +0800
Committer: lukehan <lu...@apache.org>
Committed: Wed May 20 22:02:37 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/51871fcc/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/51871fcc/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>