You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/25 06:07:36 UTC
[1/4] stratos git commit: Fix NPE when loading persisted applications
from registry
Repository: stratos
Updated Branches:
refs/heads/master 1c4533022 -> 4e99d8c0b
Fix NPE when loading persisted applications from registry
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b9591a40
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b9591a40
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b9591a40
Branch: refs/heads/master
Commit: b9591a4003faa36ff6c470b81d6bab185611eeff
Parents: 1c45330
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 25 09:32:23 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 25 09:32:23 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b9591a40/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index 6c4dc19..18a6956 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -89,9 +89,8 @@ public class AutoscalerUtil {
for (String appResourcePath : appResourcePaths) {
applications.addApplication(getApplicationFromPath(appResourcePath));
}
- return applications;
}
- return null;
+ return applications;
}
public static Application getApplication(String appId) {
[4/4] stratos git commit: Reverting PCA test profile
Posted by ra...@apache.org.
Reverting PCA test profile
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4e99d8c0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4e99d8c0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4e99d8c0
Branch: refs/heads/master
Commit: 4e99d8c0b624b7460bec4a4c188bb43a69505868
Parents: 7f89735
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 25 09:36:58 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 25 09:36:58 2015 +0530
----------------------------------------------------------------------
.../pom.xml | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4e99d8c0/components/org.apache.stratos.python.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml
index 5d45932..7debdf1 100644
--- a/components/org.apache.stratos.python.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml
@@ -32,7 +32,7 @@
<profiles>
<profile>
- <id>live</id>
+ <id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -42,6 +42,22 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <excludes>
+ <exclude>**/*/PythonCartridgeAgentTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
<includes>
<include>**/*/PythonCartridgeAgentTest.java</include>
</includes>
[3/4] stratos git commit: Remove tenant activity feature from Stratos
p2 profile
Posted by ra...@apache.org.
Remove tenant activity feature from Stratos p2 profile
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7f89735f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7f89735f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7f89735f
Branch: refs/heads/master
Commit: 7f89735f8470cbbe0e1af5d93e1eb309735a67e4
Parents: 1cf0d0f
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 25 09:35:28 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 25 09:35:28 2015 +0530
----------------------------------------------------------------------
products/stratos/modules/p2-profile-gen/pom.xml | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7f89735f/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 175f51d..662a012 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -501,9 +501,6 @@
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.manager.styles.feature:${project.version}
</featureArtifactDef>
- <featureArtifactDef>
- org.apache.stratos:org.apache.stratos.tenant.activity.server.feature:${project.version}
- </featureArtifactDef>
<!-- Mock IaaS features -->
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.mock.iaas.api.feature:${project.version}
@@ -684,10 +681,6 @@
<version>${carbon.kernel.version}</version>
</feature>
<feature>
- <id>org.apache.stratos.tenant.activity.server.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
<id>org.apache.stratos.manager.feature.group</id>
<version>${project.version}</version>
</feature>
@@ -1213,10 +1206,6 @@
<version>${project.version}</version>
</feature>
<feature>
- <id>org.apache.stratos.tenant.activity.server.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
<id>org.apache.stratos.manager.feature.group</id>
<version>${project.version}</version>
</feature>
[2/4] stratos git commit: Change Kubernetes API dependency bundle
version to original released version
Posted by ra...@apache.org.
Change Kubernetes API dependency bundle version to original released version
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1cf0d0f3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1cf0d0f3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1cf0d0f3
Branch: refs/heads/master
Commit: 1cf0d0f3e3d33ec2c538238d2d85879488b81d2d
Parents: b9591a4
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Aug 25 09:34:33 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Aug 25 09:34:33 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cloud.controller.feature/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1cf0d0f3/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index 372ce60..c9c98ae 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -91,7 +91,7 @@
</bundleDef>
<!-- Kubernetes API wrapper -->
- <bundleDef>org.apache.stratos:kubernetes-api:${project.version}</bundleDef>
+ <bundleDef>org.apache.stratos:kubernetes-api:${kubernetes.api.version}</bundleDef>
<!-- Forked jclouds providers -->
<bundleDef>org.apache.stratos:aws-ec2:${jclouds.version}</bundleDef>