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/94341ea4 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/94341ea4 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/94341ea4 Branch: refs/heads/master Commit: 94341ea4c95ba2524e3770b1991e186011ff8ebc Parents: 207d314 Author: gayan <[email protected]> Authored: Fri Nov 28 17:22:16 2014 +0530 Committer: gayan <[email protected]> Committed: Fri Nov 28 18:27:55 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/cluster/ClusterMonitorFactory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/94341ea4/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 051c9f8..1b61bb9 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 @@ -35,9 +35,10 @@ import org.apache.stratos.messaging.domain.topology.MemberStatus; */ public class ClusterMonitorFactory { - private static final Log log = LogFactory.getLog(ClusterMonitorFactory.class); + private static final Log log = LogFactory.getLog(ClusterMonitorFactory.class); 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
