Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3f0fff7b Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3f0fff7b Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3f0fff7b Branch: refs/heads/master Commit: 3f0fff7b0219bb687fddbf315401ec271e1d0377 Parents: f83160e ece29e6 Author: Nirmal Fernando <[email protected]> Authored: Wed Feb 26 20:14:48 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Feb 26 20:14:48 2014 +0530 ---------------------------------------------------------------------- .../apache/stratos/cartridge/agent/CartridgeAgent.java | 4 +++- .../agent/config/CartridgeAgentConfiguration.java | 13 +++++++++++-- .../statistics/publisher/HealthStatisticsNotifier.java | 2 +- .../stratos/cartridge/agent/util/ExtensionUtils.java | 8 ++++---- .../stratos/cli/commands/AutoscalePolicyCommand.java | 2 +- .../cli/commands/DescribeAutoScalingPolicyCommand.java | 2 +- .../cli/commands/DescribeDeploymentPolicyCommand.java | 2 +- .../org/apache/stratos/cli/commands/ExitCommand.java | 2 +- .../apache/stratos/cli/commands/SubscribeCommand.java | 10 +++++----- .../commands/UndeployCartridgeDefinitionCommand.java | 2 +- .../org/apache/stratos/cli/utils/CliConstants.java | 6 +++--- .../console/subscribe_cartridge.jag | 2 +- .../console/util/utility.jag | 4 ++++ .../distribution/src/main/extensions/mount_volumes.sh | 5 ++--- 14 files changed, 39 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
