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/8e7fc3d4 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8e7fc3d4 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8e7fc3d4 Branch: refs/heads/1.5.x-HBase1.x Commit: 8e7fc3d45aa17e875f6117743a677f7436ea54a4 Parents: 5718740 Author: shaofengshi <shaofeng...@apache.org> Authored: Sat Jun 4 08:24:38 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Mon Jul 25 16:04:26 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/8e7fc3d4/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/8e7fc3d4/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/jdbc/pom.xml b/jdbc/pom.xml index 3ae2eef..97468b3 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/8e7fc3d4/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>
