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/b797ef7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b797ef7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b797ef7a Branch: refs/heads/master Commit: b797ef7a5e9fedb86f1914ea385ddfe7ea2597e5 Parents: 3fdc53c 819373a Author: Manula Thantriwatte <[email protected]> Authored: Tue Dec 17 18:51:34 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Dec 17 18:51:34 2013 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/stratos/autoscaler/ClusterMonitor.java | 2 +- features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml | 4 ++-- .../org.apache.stratos.cloud.controller.feature/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
