You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/03/28 17:48:44 UTC
[1/2] git commit: correcting distro names
Repository: incubator-stratos
Updated Branches:
refs/heads/master 9c2b9c25b -> 064f7e8b5
correcting distro names
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3b413f57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3b413f57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3b413f57
Branch: refs/heads/master
Commit: 3b413f576ba1983f00d5f344ed890ab301d43d05
Parents: 52fd899
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Mar 28 22:17:53 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Mar 28 22:17:53 2014 +0530
----------------------------------------------------------------------
products/stratos/modules/integration/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3b413f57/products/stratos/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml
index f1afb5b..304cb5b 100755
--- a/products/stratos/modules/integration/pom.xml
+++ b/products/stratos/modules/integration/pom.xml
@@ -62,10 +62,10 @@
<systemProperties>
<maven.test.haltafterfailure>false</maven.test.haltafterfailure>
<carbon.zip>
- ${basedir}/../distribution/target/apache-stratos-manager-${project.version}.zip
+ ${basedir}/../distribution/target/apache-stratos-${project.version}.zip
</carbon.zip>
<sec.verifier.dir>${basedir}/target/security-verifier/</sec.verifier.dir>
- <extracted.dir>stratos-manager-parent-${project.version}</extracted.dir>
+ <extracted.dir>stratos-parent-${project.version}</extracted.dir>
<emma.home>${basedir}/target/emma</emma.home>
</systemProperties>
<workingDirectory>${basedir}/target</workingDirectory>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/064f7e8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/064f7e8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/064f7e8b
Branch: refs/heads/master
Commit: 064f7e8b51be82dea53f171aeb615326ad65e416
Parents: 3b413f5 9c2b9c2
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Mar 28 22:18:02 2014 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Mar 28 22:18:02 2014 +0530
----------------------------------------------------------------------
.../repository/conf/activemq/jndi.properties | 28 ++++
.../config/all/repository/conf/autoscaler.xml | 39 ++++++
.../repository/conf/cartridge-config.properties | 28 ++++
.../all/repository/conf/cloud-controller.xml | 89 +++++++++++++
.../conf/datasources/master-datasources.xml | 129 +++++++++++++++++++
.../conf/datasources/stratos-datasources.xml | 51 ++++++++
.../config/all/repository/conf/jndi.properties | 32 +++++
7 files changed, 396 insertions(+)
----------------------------------------------------------------------