Merge release branch 4.8 to 4.9 * 4.8: server: give more memory to tests packaging: Marvin and integration-tests packages
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c03d035c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c03d035c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c03d035c Branch: refs/heads/4.9-bountycastle-daan Commit: c03d035c8bd97faf9eb751590d4d67625a9f07bd Parents: 227ff38 a54a3b5 Author: Rajani Karuturi <[email protected]> Authored: Fri Aug 5 14:30:45 2016 +0530 Committer: Rajani Karuturi <[email protected]> Committed: Fri Aug 5 14:30:45 2016 +0530 ---------------------------------------------------------------------- client/pom.xml | 1 + debian/cloudstack-integration-tests.install | 18 ++++++++ debian/cloudstack-marvin.install | 18 ++++++++ debian/cloudstack-marvin.postinst | 23 +++++++++++ debian/control | 10 +++++ debian/rules | 10 ++++- packaging/centos63/cloud.spec | 52 ++++++++++++++++++++++-- packaging/centos7/cloud.spec | 46 ++++++++++++++++++++- pom.xml | 7 ++++ server/pom.xml | 2 +- tools/marvin/pom.xml | 4 +- 11 files changed, 182 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c03d035c/client/pom.xml ---------------------------------------------------------------------- diff --cc client/pom.xml index 58ade0c,eea635b..43bfd50 --- a/client/pom.xml +++ b/client/pom.xml @@@ -17,8 -17,9 +17,9 @@@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack</artifactId> - <version>4.8.1-SNAPSHOT</version> + <version>4.9.0</version> </parent> + <dependencies> <dependency> <groupId>org.apache.cloudstack</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c03d035c/debian/control ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c03d035c/packaging/centos63/cloud.spec ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c03d035c/packaging/centos7/cloud.spec ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c03d035c/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 6cec46d,cc4c99c..d06f2c2 --- a/pom.xml +++ b/pom.xml @@@ -44,6 -44,17 +44,13 @@@ <url>https://issues.apache.org/jira/browse/CLOUDSTACK</url> </issueManagement> + <repositories> + <repository> + <id>juniper-contrail</id> + <url>http://juniper.github.io/contrail-maven/snapshots</url> + </repository> + </repositories> + - <prerequisites> - <maven>3.0.4</maven> - </prerequisites> - <properties> <cs.jdk.version>1.7</cs.jdk.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c03d035c/server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c03d035c/tools/marvin/pom.xml ----------------------------------------------------------------------
