You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/09/16 08:03:00 UTC
[1/3] git commit: Merge branch '4.0.0-grouping' of
https://git-wip-us.apache.org/repos/asf/stratos into group
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping e39473dd7 -> c03f1040e
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/614fc91e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/614fc91e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/614fc91e
Branch: refs/heads/4.0.0-grouping
Commit: 614fc91ed68c931686c3ce243f1b567966c5d7a3
Parents: a495dc1 dab0855
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Sep 16 11:21:45 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Sep 16 11:30:57 2014 +0530
----------------------------------------------------------------------
products/stratos/modules/p2-profile-gen/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
[2/3] git commit: fixing pom conflict
Posted by ud...@apache.org.
fixing pom conflict
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9f7975df
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9f7975df
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9f7975df
Branch: refs/heads/4.0.0-grouping
Commit: 9f7975dfb13c44c4628b08cd85931abecba38f48
Parents: 614fc91
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Sep 16 11:31:45 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Sep 16 11:31:45 2014 +0530
----------------------------------------------------------------------
products/stratos/modules/p2-profile-gen/pom.xml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9f7975df/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 0db341c..48161dc 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -22,11 +22,7 @@
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos</artifactId>
-<<<<<<< HEAD
<version>4.1.0-SNAPSHOT</version>
-=======
- <version>4.0.0</version>
->>>>>>> ba4d11984f33c63ed1332569831889f4892c5351
<relativePath>../../pom.xml</relativePath>
</parent>
[3/3] git commit: Merge branch '4.0.0-grouping' of
https://git-wip-us.apache.org/repos/asf/stratos into group
Posted by ud...@apache.org.
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into group
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c03f1040
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c03f1040
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c03f1040
Branch: refs/heads/4.0.0-grouping
Commit: c03f1040e168ed282b142d82f00eccd0bd033e67
Parents: 9f7975d e39473d
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Sep 16 11:32:43 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Sep 16 11:32:43 2014 +0530
----------------------------------------------------------------------
.../parser/DefaultApplicationParser.java | 10 ++-
.../impl/CloudControllerServiceImpl.java | 2 +-
.../cloud/controller/pojo/GroupDataHolder.java | 67 --------------------
.../controller/topology/TopologyBuilder.java | 7 +-
.../ApplicationCreatedMessageProcessor.java | 2 +-
5 files changed, 16 insertions(+), 72 deletions(-)
----------------------------------------------------------------------