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:03 UTC
[04/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/7b1737b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7b1737b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7b1737b8
Branch: refs/heads/0.7.1-staging
Commit: 7b1737b85e76e2260452dc1008efa5530cbb6185
Parents: 0c23cca
Author: lukehan <lu...@apache.org>
Authored: Wed May 20 21:56:57 2015 +0800
Committer: lukehan <lu...@apache.org>
Committed: Wed May 20 22:00:53 2015 +0800
----------------------------------------------------------------------
atopcalcite/pom.xml | 4 ++++
server/pom.xml | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7b1737b8/atopcalcite/pom.xml
----------------------------------------------------------------------
diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml
index 9417503..9450df4 100644
--- a/atopcalcite/pom.xml
+++ b/atopcalcite/pom.xml
@@ -27,7 +27,11 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
+<<<<<<< HEAD
<version>0.7.1-incubating</version>
+=======
+ <version>0.7.2-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/7b1737b8/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 276e384..ef17c4e 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -28,7 +28,6 @@
<parent>
<groupId>org.apache.kylin</groupId>
<artifactId>kylin</artifactId>
- <version>0.7.1-incubating</version>
</parent>
<properties>