You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/12/18 07:45:12 UTC
[1/2] git commit: Updating terminate info log in cloud controller
client
Updated Branches:
refs/heads/master 39395ad69 -> 3ce1815d6
Updating terminate info log in cloud controller client
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5e009442
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5e009442
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5e009442
Branch: refs/heads/master
Commit: 5e009442917bbbe8b18daab6106f52aec2b14ac4
Parents: 256cb0a
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 18 12:14:48 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 18 12:14:48 2013 +0530
----------------------------------------------------------------------
.../client/cloud/controller/CloudControllerClient.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5e009442/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
index 9a48946..7208e87 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/client/cloud/controller/CloudControllerClient.java
@@ -161,7 +161,7 @@ public class CloudControllerClient {
public void terminateAllInstances(String clusterId) throws TerminationException {
try {
if(log.isInfoEnabled()) {
- log.info(String.format("Terminating all instances of cluster via cloud controller: %s", clusterId));
+ log.info(String.format("Terminating all instances of cluster via cloud controller: [cluster] %s", clusterId));
}
long startTime = System.currentTimeMillis();
stub.terminateAllInstances(clusterId);
@@ -186,7 +186,7 @@ public class CloudControllerClient {
public void terminate(String memberId) throws TerminationException {
try {
if(log.isInfoEnabled()) {
- log.info(String.format("Calling cloud controller to terminate instance: [member] %s", memberId));
+ log.info(String.format("Terminating instance via cloud controller: [member] %s", memberId));
}
long startTime = System.currentTimeMillis();
stub.terminateInstance(memberId);
[2/2] git commit: Merge remote-tracking branch 'origin/master'
Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3ce1815d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3ce1815d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3ce1815d
Branch: refs/heads/master
Commit: 3ce1815d6aa8e8524267489fa6c38a39e928299b
Parents: 5e00944 39395ad
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed Dec 18 12:15:04 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed Dec 18 12:15:04 2013 +0530
----------------------------------------------------------------------
.../autoscaler/policy/PolicyManager.java | 5 ++--
.../stratos/cli/RestCommandLineService.java | 1 +
products/stratos-cli/README.txt | 31 ++++++++++----------
3 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------