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/8e89271c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8e89271c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8e89271c Branch: refs/heads/master Commit: 8e89271cd9401673faebcf150338c2055b15fdef Parents: 0a9e186 a7a6ef2 Author: Udara Liyanage <[email protected]> Authored: Tue Nov 26 19:30:34 2013 -0500 Committer: Udara Liyanage <[email protected]> Committed: Tue Nov 26 19:30:34 2013 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/stratos/autoscaler/ClusterContext.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
