Rebase the master and merge changes of PR 121
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8554704c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8554704c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8554704c Branch: refs/heads/master Commit: 8554704cdb7eebdef4d8aa827db1be7abe6b111d Parents: f21fc61 Author: gayan <[email protected]> Authored: Fri Nov 28 17:27:49 2014 +0530 Committer: gayan <[email protected]> Committed: Fri Nov 28 18:28:59 2014 +0530 ---------------------------------------------------------------------- .../monitor/cluster/ClusterMonitorFactory.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/8554704c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java index e1d6f62..e5a5bda 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitorFactory.java @@ -49,13 +49,13 @@ public class ClusterMonitorFactory { public static final String IS_PRIMARY = "PRIMARY"; /** - * @param cluster the cluster to be monitored - * @return the created cluster monitor - * @throws PolicyValidationException when deployment policy is not valid - * @throws PartitionValidationException when partition is not valid - */ - public static AbstractClusterMonitor getMonitor(Cluster cluster) - throws PolicyValidationException, PartitionValidationException { + * @param cluster the cluster to be monitored + * @return the created cluster monitor + * @throws PolicyValidationException when deployment policy is not valid + * @throws PartitionValidationException when partition is not valid + */ + public static AbstractClusterMonitor getMonitor(Cluster cluster) + throws PolicyValidationException, PartitionValidationException { AbstractClusterMonitor clusterMonitor; if (cluster.isKubernetesCluster()) {
