Merge release branch 4.9 to master * 4.9: 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/2875af71 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2875af71 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2875af71 Branch: refs/heads/4.9-bountycastle-daan Commit: 2875af71126cbfb6ebd0d47c2d593ff6d9c61c20 Parents: 3315eb5 c03d035 Author: Rajani Karuturi <[email protected]> Authored: Fri Aug 5 14:41:31 2016 +0530 Committer: Rajani Karuturi <[email protected]> Committed: Fri Aug 5 14:41:31 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 ++++ tools/marvin/pom.xml | 4 +- 10 files changed, 181 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2875af71/client/pom.xml ---------------------------------------------------------------------- diff --cc client/pom.xml index d686892,43bfd50..621c81b --- 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.9.0</version> + <version>4.10.0-SNAPSHOT</version> </parent> + <dependencies> <dependency> <groupId>org.apache.cloudstack</groupId> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2875af71/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2875af71/tools/marvin/pom.xml ----------------------------------------------------------------------
