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 2014/10/11 21:17:23 UTC
[1/2] git commit: Updating list command result header text in CLI
Repository: stratos
Updated Branches:
refs/heads/master b299559d1 -> 2e1a50207
Updating list command result header text in CLI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ba4420e7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ba4420e7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ba4420e7
Branch: refs/heads/master
Commit: ba4420e7526ec4754b8b3f8aa508b65e0b463a10
Parents: a6f4efe
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Oct 12 00:47:01 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Oct 12 00:47:01 2014 +0530
----------------------------------------------------------------------
.../main/java/org/apache/stratos/cli/RestCommandLineService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ba4420e7/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 72c7855..8db4b9b 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -299,6 +299,7 @@ public class RestCommandLineService {
Cartridge[] cartridges = new Cartridge[cartridgeList.getCartridge().size()];
cartridges = cartridgeList.getCartridge().toArray(cartridges);
+ System.out.println("Cartridges found:");
CliUtils.printTable(cartridges, cartridgeMapper, "Type", "Name", "Description", "Version",
"Is Multi-Tenant", "Accessibility");
} catch (Exception e) {
@@ -397,7 +398,7 @@ public class RestCommandLineService {
headers.add("Repo URL");
}
- System.out.println("Cartridge subscriptions:");
+ System.out.println("Cartridge subscriptions found:");
CliUtils.printTable(cartridges, cartridgeMapper, headers.toArray(new String[headers.size()]));
} catch (Exception e) {
String message = "Error in listing cartridge subscriptions";
[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/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2e1a5020
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2e1a5020
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2e1a5020
Branch: refs/heads/master
Commit: 2e1a5020737a7b6ba99acd5b36b08096bd3699a0
Parents: ba4420e b299559
Author: Imesh Gunaratne <im...@apache.org>
Authored: Sun Oct 12 00:47:16 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Sun Oct 12 00:47:16 2014 +0530
----------------------------------------------------------------------
.../monitor/ClusterMonitorFactory.java | 10 ++-
.../monitor/KubernetesClusterMonitor.java | 67 +++++++++++++++++++-
.../autoscaler/rule/RuleTasksDelegator.java | 31 +++++++--
.../stratos/messaging/util/Constants.java | 2 +-
.../src/main/conf/container-mincheck.drl | 15 +++--
.../src/main/conf/container-scaling.drl | 62 ++++++++++--------
6 files changed, 146 insertions(+), 41 deletions(-)
----------------------------------------------------------------------