You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2016/08/05 09:20:52 UTC
[6/9] git commit: updated refs/heads/master to 2875af7
Merge release branch 4.7 to 4.8
* 4.7:
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/a54a3b5c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a54a3b5c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a54a3b5c
Branch: refs/heads/master
Commit: a54a3b5cd5fece41ffaad720ed54317c41a0dec5
Parents: 01758ee 9127af6
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Fri Aug 5 14:29:16 2016 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Fri Aug 5 14:29:16 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/a54a3b5c/client/pom.xml
----------------------------------------------------------------------
diff --cc client/pom.xml
index d329c7f,6d8b6ff..eea635b
--- 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.7.2-SNAPSHOT</version>
+ <version>4.8.1-SNAPSHOT</version>
</parent>
+
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a54a3b5c/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a54a3b5c/server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a54a3b5c/tools/marvin/pom.xml
----------------------------------------------------------------------