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/207d3148 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/207d3148 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/207d3148 Branch: refs/heads/master Commit: 207d3148475a1697076685b8a198081344f20381 Parents: 19a259c Author: gayan <[email protected]> Authored: Fri Nov 28 17:19:59 2014 +0530 Committer: gayan <[email protected]> Committed: Fri Nov 28 18:27:44 2014 +0530 ---------------------------------------------------------------------- .../stratos/cloud/controller/impl/CloudControllerServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/207d3148/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 54a030e..93ea90b 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -78,8 +78,7 @@ import java.util.concurrent.Future; */ public class CloudControllerServiceImpl implements CloudControllerService { - private static final Log LOG = LogFactory - .getLog(CloudControllerServiceImpl.class); + private static final Log LOG = LogFactory.getLog(CloudControllerServiceImpl.class); public static final String IS_LOAD_BALANCER = "load.balancer"; private FasterLookUpDataHolder dataHolder = FasterLookUpDataHolder
