You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by sa...@apache.org on 2014/10/06 20:06:41 UTC
[1/4] git commit: Fixing a typo in a log.
Repository: stratos
Updated Branches:
refs/heads/master 58e300a5e -> 40c0b3cd1
Fixing a typo in a log.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/81eaea24
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/81eaea24
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/81eaea24
Branch: refs/heads/master
Commit: 81eaea240d949e3d412fe83be75d007864bca41a
Parents: 5b5f135
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Mon Oct 6 10:23:14 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Mon Oct 6 10:23:14 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/impl/CloudControllerServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/81eaea24/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
index 824bc29..18269e6 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java
@@ -1422,7 +1422,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
kubApi.createReplicationController(controller);
if (log.isDebugEnabled()) {
- log.debug("Cloud Controller successfully starte the controller "
+ log.debug("Cloud Controller successfully started the controller "
+ controller + " via Kubernetes layer.");
}
@@ -1438,7 +1438,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
kubApi.createService(service);
if (log.isDebugEnabled()) {
- log.debug("Cloud Controller successfully starte the controller "
+ log.debug("Cloud Controller successfully started the service "
+ controller + " via Kubernetes layer.");
}
[2/4] git commit: Fixing STRATOS-802
Posted by sa...@apache.org.
Fixing STRATOS-802
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5fd042e3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5fd042e3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5fd042e3
Branch: refs/heads/master
Commit: 5fd042e32d95233cb96e995f88219e6afc9f0bd3
Parents: 81eaea2
Author: sajhak <sa...@gmail.com>
Authored: Mon Oct 6 11:50:15 2014 +0530
Committer: sajhak <sa...@gmail.com>
Committed: Mon Oct 6 11:50:15 2014 +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/5fd042e3/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 2b0120f..c2e08af 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
@@ -296,7 +296,7 @@
</bundleDef>
<bundleDef>com.jcraft:jsch.agentproxy.connector-factory:0.0.7</bundleDef>
<bundleDef>com.jcraft:jsch.agentproxy.sshagent:0.0.7</bundleDef>
- <bundleDef>com.jcraft:jsch.agentproxy.usocket-jna:0.0.7</bundleDef>
+ <bundleDef>com.jcraft:jsch.agentproxy.usocket-nc:0.0.7</bundleDef>
<bundleDef>com.jcraft:jsch.agentproxy.core:0.0.7</bundleDef>
<bundleDef>net.java.dev.jna:jna:4.1.0</bundleDef>
<bundleDef>
[4/4] git commit: Merge branch 'container-autoscaling' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by sa...@apache.org.
Merge branch 'container-autoscaling' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/40c0b3cd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/40c0b3cd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/40c0b3cd
Branch: refs/heads/master
Commit: 40c0b3cd17c638a1a707bcb2bdddc5f4624dfc1c
Parents: 58e300a 7d61649
Author: sajhak <sa...@gmail.com>
Authored: Mon Oct 6 22:54:05 2014 +0530
Committer: sajhak <sa...@gmail.com>
Committed: Mon Oct 6 22:54:05 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/impl/CloudControllerServiceImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: Renaming health topic to "summarized-health-stats"
Posted by sa...@apache.org.
Renaming health topic to "summarized-health-stats"
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7d616494
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7d616494
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7d616494
Branch: refs/heads/master
Commit: 7d616494a53c9f0adcbaad1ecd5ec765433d16ca
Parents: 5fd042e
Author: Akila Perera <ra...@gmail.com>
Authored: Mon Oct 6 17:48:42 2014 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Mon Oct 6 17:54:20 2014 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/stratos/messaging/util/Constants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d616494/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
index 14ac693..2089a63 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/util/Constants.java
@@ -21,7 +21,7 @@ package org.apache.stratos.messaging.util;
public class Constants {
/* Message broker topic names */
public static final String TOPOLOGY_TOPIC = "topology/#";
- public static final String HEALTH_STAT_TOPIC = "health/#";
+ public static final String HEALTH_STAT_TOPIC = "summarized-health-stats/#";
public static final String INSTANCE_STATUS_TOPIC = "instance/status/#";
public static final String INSTANCE_NOTIFIER_TOPIC = "instance/notifier/#";
public static final String PING_TOPIC = "ping";