Rebase the master and merge changes of PR 125
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f21fc61e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f21fc61e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f21fc61e Branch: refs/heads/master Commit: f21fc61e74cacee3884191072171be243d60fc5f Parents: 94341ea Author: gayan <[email protected]> Authored: Fri Nov 28 17:24:44 2014 +0530 Committer: gayan <[email protected]> Committed: Fri Nov 28 18:28:47 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/cluster/ClusterMonitorFactory.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f21fc61e/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 1b61bb9..e1d6f62 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 @@ -21,15 +21,25 @@ package org.apache.stratos.autoscaler.monitor.cluster; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +<<<<<<< HEAD import org.apache.stratos.autoscaler.exception.partition.PartitionValidationException; import org.apache.stratos.autoscaler.exception.policy.PolicyValidationException; import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +======= +import org.apache.stratos.autoscaler.exception.PartitionValidationException; +import org.apache.stratos.autoscaler.exception.PolicyValidationException; +import org.apache.stratos.cloud.controller.stub.pojo.MemberContext; +import org.apache.stratos.common.constants.StratosConstants; +>>>>>>> 96c4da0... Rebase the master and merge changes of PR 121 import org.apache.stratos.messaging.domain.topology.Cluster; import org.apache.stratos.messaging.domain.topology.ClusterStatus; import org.apache.stratos.messaging.domain.topology.Member; import org.apache.stratos.messaging.domain.topology.MemberStatus; +<<<<<<< HEAD +======= +>>>>>>> 96c4da0... Rebase the master and merge changes of PR 121 /* * Factory class for creating cluster monitors. */
